From: Matt Caswell <matt@openssl.org>
Date: Tue, 28 Feb 2017 15:14:04 +0000 (+0000)
Subject: Remove a pointless "#ifndef" from bf_enc.c
X-Git-Tag: OpenSSL_1_1_1-pre1~2226
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a7ab9755da22d2abbdbb6b3ce4fff18f17dc0da7;p=oweals%2Fopenssl.git

Remove a pointless "#ifndef" from bf_enc.c

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2778)
---

diff --git a/crypto/bf/bf_enc.c b/crypto/bf/bf_enc.c
index 9f80c56d57..67c0d78aec 100644
--- 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