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