diff options
Diffstat (limited to 'src/lib/libcrypto/des/set_key.c')
| -rw-r--r-- | src/lib/libcrypto/des/set_key.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/lib/libcrypto/des/set_key.c b/src/lib/libcrypto/des/set_key.c index 3004cc3ab3..d3e69ca8b5 100644 --- a/src/lib/libcrypto/des/set_key.c +++ b/src/lib/libcrypto/des/set_key.c | |||
| @@ -65,6 +65,8 @@ | |||
| 65 | */ | 65 | */ |
| 66 | #include "des_locl.h" | 66 | #include "des_locl.h" |
| 67 | 67 | ||
| 68 | #include <openssl/crypto.h> | ||
| 69 | |||
| 68 | OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key,0) /* defaults to false */ | 70 | OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key,0) /* defaults to false */ |
| 69 | 71 | ||
| 70 | static const unsigned char odd_parity[256]={ | 72 | static const unsigned char odd_parity[256]={ |
| @@ -335,6 +337,13 @@ int DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule) | |||
| 335 | } | 337 | } |
| 336 | 338 | ||
| 337 | void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule) | 339 | void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule) |
| 340 | #ifdef OPENSSL_FIPS | ||
| 341 | { | ||
| 342 | fips_cipher_abort(DES); | ||
| 343 | private_DES_set_key_unchecked(key, schedule); | ||
| 344 | } | ||
| 345 | void private_DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule) | ||
| 346 | #endif | ||
| 338 | { | 347 | { |
| 339 | static const int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0}; | 348 | static const int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0}; |
| 340 | register DES_LONG c,d,t,s,t2; | 349 | register DES_LONG c,d,t,s,t2; |
