projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6bb9006
)
Remove a pointless "#ifndef" from bf_enc.c
author
Matt Caswell
<matt@openssl.org>
Tue, 28 Feb 2017 15:14:04 +0000
(15:14 +0000)
committer
Matt Caswell
<matt@openssl.org>
Tue, 28 Feb 2017 15:17:46 +0000
(15:17 +0000)
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2778)
crypto/bf/bf_enc.c
patch
|
blob
|
history
diff --git
a/crypto/bf/bf_enc.c
b/crypto/bf/bf_enc.c
index 9f80c56d57167c5063025388d40e1d11e527958d..67c0d78aec5cba4cb2ca1ab9476e2cb8d5fcd6f7 100644
(file)
--- a/
crypto/bf/bf_enc.c
+++ b/
crypto/bf/bf_enc.c
@@
-60,8
+60,6
@@
void BF_encrypt(BF_LONG *data, const BF_KEY *key)
data[0] = r & 0xffffffffU;
}
-#ifndef BF_DEFAULT_OPTIONS
-
void BF_decrypt(BF_LONG *data, const BF_KEY *key)
{
register BF_LONG l, r;
@@
-175,5
+173,3
@@
void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0;
tin[0] = tin[1] = 0;
}
-
-#endif