summaryrefslogtreecommitdiffstats
path: root/crypto/include/internal
diff options
context:
space:
mode:
authorShane Lontis <shane.lontis@oracle.com>2019-09-15 19:33:04 +1000
committerShane Lontis <shane.lontis@oracle.com>2019-09-15 19:33:04 +1000
commitdd11c5f0fa809063b152cd2851c4c1e56fbd20c8 (patch)
tree66805ded5412fcc7b6eb38f9c743d9ff520ca56d /crypto/include/internal
parentf407a9a998f95f693a7127bc76a2c922dfaedbdb (diff)
Fix compile error detected by Solaris build
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9901)
Diffstat (limited to 'crypto/include/internal')
-rw-r--r--crypto/include/internal/ciphermode_platform.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/crypto/include/internal/ciphermode_platform.h b/crypto/include/internal/ciphermode_platform.h
index f357ea5c84..a99ce0d495 100644
--- a/crypto/include/internal/ciphermode_platform.h
+++ b/crypto/include/internal/ciphermode_platform.h
@@ -238,12 +238,6 @@ void aes_t4_encrypt(const unsigned char *in, unsigned char *out,
const AES_KEY *key);
void aes_t4_decrypt(const unsigned char *in, unsigned char *out,
const AES_KEY *key);
-void des_t4_key_expand(const void *key, DES_key_schedule *ks);
-void des_t4_ede3_cbc_encrypt(const void *inp, void *out, size_t len,
- const DES_key_schedule ks[3], unsigned char iv[8]);
-void des_t4_ede3_cbc_decrypt(const void *inp, void *out, size_t len,
- const DES_key_schedule ks[3], unsigned char iv[8]);
-
/*
* Key-length specific subroutines were chosen for following reason.
* Each SPARC T4 core can execute up to 8 threads which share core's
@@ -295,6 +289,15 @@ void aes256_t4_xts_decrypt(const unsigned char *in, unsigned char *out,
size_t blocks, const AES_KEY *key1,
const AES_KEY *key2, const unsigned char *ivec);
+# ifndef OPENSSL_NO_DES
+# include <openssl/des.h>
+void des_t4_key_expand(const void *key, DES_key_schedule *ks);
+void des_t4_ede3_cbc_encrypt(const void *inp, void *out, size_t len,
+ const DES_key_schedule ks[3], unsigned char iv[8]);
+void des_t4_ede3_cbc_decrypt(const void *inp, void *out, size_t len,
+ const DES_key_schedule ks[3], unsigned char iv[8]);
+# endif /* OPENSSL_NO_DES */
+
# elif defined(OPENSSL_CPUID_OBJ) && defined(__s390__)
/* IBM S390X support */
# include "s390x_arch.h"