From: Isaac Boukris <iboukris@gmail.com>
Date: Sun, 5 Dec 2021 21:08:41 +0000 (-0500)
Subject: Fix OpenSSL conditionals for two files
X-Git-Tag: krb5-1.20-beta1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b1bc3801b57ece62d00a491bbd0819abd162dd2;p=thirdparty%2Fkrb5.git

Fix OpenSSL conditionals for two files

Commit 7e8c41afc54db2ca75de5a1e2e440b034be8887b mistakenly left
two files.  Fix them.

[ghudson@mit.edu: keep crypto_int.h include unconditional; wrote
commit message]
---

diff --git a/src/lib/crypto/openssl/des/des_keys.c b/src/lib/crypto/openssl/des/des_keys.c
index 0a4a5178b5..83f1cbf22a 100644
--- a/src/lib/crypto/openssl/des/des_keys.c
+++ b/src/lib/crypto/openssl/des/des_keys.c
@@ -25,12 +25,15 @@
  */
 
 #include "crypto_int.h"
-#include <openssl/des.h>
 
 #ifdef K5_OPENSSL_DES_KEY_PARITY
+
+#include <openssl/des.h>
+
 void
 k5_des_fixup_key_parity(unsigned char *keybits)
 {
     DES_set_odd_parity((DES_cblock *)keybits);
 }
+
 #endif
diff --git a/src/lib/crypto/openssl/enc_provider/camellia.c b/src/lib/crypto/openssl/enc_provider/camellia.c
index 81f4772ca6..01920e6ce1 100644
--- a/src/lib/crypto/openssl/enc_provider/camellia.c
+++ b/src/lib/crypto/openssl/enc_provider/camellia.c
@@ -25,6 +25,9 @@
  */
 
 #include "crypto_int.h"
+
+#ifdef K5_OPENSSL_CAMELLIA
+
 #include <openssl/evp.h>
 #include <openssl/camellia.h>
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
@@ -33,8 +36,6 @@
 #include <openssl/modes.h>
 #endif
 
-#ifdef K5_OPENSSL_CAMELLIA
-
 static krb5_error_code
 cbc_enc(krb5_key key, const krb5_data *ivec, krb5_crypto_iov *data,
         size_t num_data);