diff options
Diffstat (limited to 'src/lib/libcrypto/des/des_enc.c')
| -rw-r--r-- | src/lib/libcrypto/des/des_enc.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/lib/libcrypto/des/des_enc.c b/src/lib/libcrypto/des/des_enc.c index 6a49ec4a55..53705b9f5b 100644 --- a/src/lib/libcrypto/des/des_enc.c +++ b/src/lib/libcrypto/des/des_enc.c | |||
| @@ -58,9 +58,6 @@ | |||
| 58 | 58 | ||
| 59 | #include "des_locl.h" | 59 | #include "des_locl.h" |
| 60 | 60 | ||
| 61 | #ifndef OPENSSL_FIPS | ||
| 62 | #ifndef OPENBSD_DES_ASM | ||
| 63 | |||
| 64 | void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc) | 61 | void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc) |
| 65 | { | 62 | { |
| 66 | register DES_LONG l,r,t,u; | 63 | register DES_LONG l,r,t,u; |
| @@ -291,12 +288,8 @@ void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1, | |||
| 291 | data[1]=r; | 288 | data[1]=r; |
| 292 | } | 289 | } |
| 293 | 290 | ||
| 294 | #endif /* ndef OPENSSL_FIPS */ | ||
| 295 | |||
| 296 | #ifndef DES_DEFAULT_OPTIONS | 291 | #ifndef DES_DEFAULT_OPTIONS |
| 297 | 292 | ||
| 298 | #if !defined(OPENSSL_FIPS_DES_ASM) | ||
| 299 | |||
| 300 | #undef CBC_ENC_C__DONT_UPDATE_IV | 293 | #undef CBC_ENC_C__DONT_UPDATE_IV |
| 301 | #include "ncbc_enc.c" /* DES_ncbc_encrypt */ | 294 | #include "ncbc_enc.c" /* DES_ncbc_encrypt */ |
| 302 | 295 | ||
| @@ -412,6 +405,4 @@ void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output, | |||
| 412 | tin[0]=tin[1]=0; | 405 | tin[0]=tin[1]=0; |
| 413 | } | 406 | } |
| 414 | 407 | ||
| 415 | #endif /* !defined(OPENSSL_FIPS_DES_ASM) */ | ||
| 416 | |||
| 417 | #endif /* DES_DEFAULT_OPTIONS */ | 408 | #endif /* DES_DEFAULT_OPTIONS */ |
