diff options
Diffstat (limited to 'src/lib/libcrypto/des')
| -rw-r--r-- | src/lib/libcrypto/des/des.h | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/des/set_key.c | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/lib/libcrypto/des/des.h b/src/lib/libcrypto/des/des.h index 1eaedcbd24..92b6663599 100644 --- a/src/lib/libcrypto/des/des.h +++ b/src/lib/libcrypto/des/des.h | |||
| @@ -224,9 +224,6 @@ int DES_set_key(const_DES_cblock *key,DES_key_schedule *schedule); | |||
| 224 | int DES_key_sched(const_DES_cblock *key,DES_key_schedule *schedule); | 224 | int DES_key_sched(const_DES_cblock *key,DES_key_schedule *schedule); |
| 225 | int DES_set_key_checked(const_DES_cblock *key,DES_key_schedule *schedule); | 225 | int DES_set_key_checked(const_DES_cblock *key,DES_key_schedule *schedule); |
| 226 | void DES_set_key_unchecked(const_DES_cblock *key,DES_key_schedule *schedule); | 226 | void DES_set_key_unchecked(const_DES_cblock *key,DES_key_schedule *schedule); |
| 227 | #ifdef OPENSSL_FIPS | ||
| 228 | void private_DES_set_key_unchecked(const_DES_cblock *key,DES_key_schedule *schedule); | ||
| 229 | #endif | ||
| 230 | void DES_string_to_key(const char *str,DES_cblock *key); | 227 | void DES_string_to_key(const char *str,DES_cblock *key); |
| 231 | void DES_string_to_2keys(const char *str,DES_cblock *key1,DES_cblock *key2); | 228 | void DES_string_to_2keys(const char *str,DES_cblock *key1,DES_cblock *key2); |
| 232 | void DES_cfb64_encrypt(const unsigned char *in,unsigned char *out,long length, | 229 | void DES_cfb64_encrypt(const unsigned char *in,unsigned char *out,long length, |
diff --git a/src/lib/libcrypto/des/set_key.c b/src/lib/libcrypto/des/set_key.c index 99e3555ba9..e8dea50b96 100644 --- a/src/lib/libcrypto/des/set_key.c +++ b/src/lib/libcrypto/des/set_key.c | |||
| @@ -336,13 +336,6 @@ int DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule) | |||
| 336 | } | 336 | } |
| 337 | 337 | ||
| 338 | void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule) | 338 | void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule) |
| 339 | #ifdef OPENSSL_FIPS | ||
| 340 | { | ||
| 341 | fips_cipher_abort(DES); | ||
| 342 | private_DES_set_key_unchecked(key, schedule); | ||
| 343 | } | ||
| 344 | void private_DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule) | ||
| 345 | #endif | ||
| 346 | { | 339 | { |
| 347 | static const int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0}; | 340 | static const int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0}; |
| 348 | register DES_LONG c,d,t,s,t2; | 341 | register DES_LONG c,d,t,s,t2; |
