Fix escaping code for string printing. If *any* escaping is enabled we

[oweals/openssl.git] / crypto / des / des_enc.c

diff --git a/crypto/des/des_enc.c b/crypto/des/des_enc.c
index 1c37ab96d3ded2c158cfe1c351cb26e7ee4fdf20..cf71965acae09720284ccb22b8bc5d0a2dbe4e55 100644 (file)
--- a/crypto/des/des_enc.c
+++ b/crypto/des/des_enc.c
@@ -289,6 +289,8 @@ void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
 
 #ifndef DES_DEFAULT_OPTIONS
 
+#if !defined(OPENSSL_FIPS_DES_ASM)
+
 #undef CBC_ENC_C__DONT_UPDATE_IV
 #include "ncbc_enc.c" /* DES_ncbc_encrypt */
 
@@ -404,4 +406,6 @@ void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
        tin[0]=tin[1]=0;
        }
 
+#endif
+
 #endif /* DES_DEFAULT_OPTIONS */