diff options
Diffstat (limited to 'src/lib/libcrypto/cast')
-rw-r--r-- | src/lib/libcrypto/cast/c_skey.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/cast/cast.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/libcrypto/cast/c_skey.c b/src/lib/libcrypto/cast/c_skey.c index 76e40005c9..dc4791a8cf 100644 --- a/src/lib/libcrypto/cast/c_skey.c +++ b/src/lib/libcrypto/cast/c_skey.c | |||
@@ -56,7 +56,9 @@ | |||
56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
57 | */ | 57 | */ |
58 | 58 | ||
59 | #include <openssl/crypto.h> | ||
59 | #include <openssl/cast.h> | 60 | #include <openssl/cast.h> |
61 | |||
60 | #include "cast_lcl.h" | 62 | #include "cast_lcl.h" |
61 | #include "cast_s.h" | 63 | #include "cast_s.h" |
62 | 64 | ||
@@ -72,7 +74,7 @@ | |||
72 | #define S6 CAST_S_table6 | 74 | #define S6 CAST_S_table6 |
73 | #define S7 CAST_S_table7 | 75 | #define S7 CAST_S_table7 |
74 | 76 | ||
75 | void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data) | 77 | FIPS_NON_FIPS_VCIPHER_Init(CAST) |
76 | { | 78 | { |
77 | CAST_LONG x[16]; | 79 | CAST_LONG x[16]; |
78 | CAST_LONG z[16]; | 80 | CAST_LONG z[16]; |
diff --git a/src/lib/libcrypto/cast/cast.h b/src/lib/libcrypto/cast/cast.h index b28e4e4f3b..9e300178d9 100644 --- a/src/lib/libcrypto/cast/cast.h +++ b/src/lib/libcrypto/cast/cast.h | |||
@@ -81,7 +81,10 @@ typedef struct cast_key_st | |||
81 | int short_key; /* Use reduced rounds for short key */ | 81 | int short_key; /* Use reduced rounds for short key */ |
82 | } CAST_KEY; | 82 | } CAST_KEY; |
83 | 83 | ||
84 | 84 | ||
85 | #ifdef OPENSSL_FIPS | ||
86 | void private_CAST_set_key(CAST_KEY *key, int len, const unsigned char *data); | ||
87 | #endif | ||
85 | void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data); | 88 | void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data); |
86 | void CAST_ecb_encrypt(const unsigned char *in,unsigned char *out,CAST_KEY *key, | 89 | void CAST_ecb_encrypt(const unsigned char *in,unsigned char *out,CAST_KEY *key, |
87 | int enc); | 90 | int enc); |