From 3dd16fb7fd1442137f6f2d00ddc27891cbc55b27 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Thu, 9 Dec 2004 22:43:29 +0000 Subject: [PATCH] Eliminate false dependency on 386 config option is FIPS context. At the same time limit assembler support to ELF platforms [that's what is there, ELF modules]. --- Configure | 5 ++--- crypto/des/des_enc.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Configure b/Configure index 927c44511e..a1bf5c9db5 100755 --- a/Configure +++ b/Configure @@ -1161,15 +1161,14 @@ if ($ranlib eq "") $bn_obj = $bn_asm unless $bn_obj ne ""; +my $fips_des_obj='asm/fips-dx86-elf.o' if ($des_obj =~ /\-elf\.o$/); +my $fips_sha1_obj='asm/sx86-elf.o' if ($sha1_obj =~ /\-elf\.o$/); if ($fips) { $des_obj=$sha1_obj=""; $openssl_other_defines.="#define OPENSSL_FIPS\n"; } $des_obj=$des_enc unless (!$fips && $des_obj =~ /\.o$/); -my $fips_des_obj='asm/fips-dx86-elf.o'; -$fips_des_obj=$fips_des_enc unless $processor eq '386'; -my $fips_sha1_obj='asm/sx86-elf.o' if $processor eq '386'; $bf_obj=$bf_enc unless ($bf_obj =~ /\.o$/); $cast_obj=$cast_enc unless ($cast_obj =~ /\.o$/); $rc4_obj=$rc4_enc unless ($rc4_obj =~ /\.o$/); diff --git a/crypto/des/des_enc.c b/crypto/des/des_enc.c index 8dd30e2cb7..2bf8402740 100644 --- a/crypto/des/des_enc.c +++ b/crypto/des/des_enc.c @@ -293,7 +293,7 @@ void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1, #ifndef DES_DEFAULT_OPTIONS -#if !defined(OPENSSL_FIPS) || !defined(I386_ONLY) +#if !defined(OPENSSL_FIPS) #undef CBC_ENC_C__DONT_UPDATE_IV #include "ncbc_enc.c" /* DES_ncbc_encrypt */ @@ -410,6 +410,6 @@ void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output, tin[0]=tin[1]=0; } -#endif /* !defined(OPENSSL_FIPS) || !defined(I386_ONLY) */ +#endif /* !defined(OPENSSL_FIPS) */ #endif /* DES_DEFAULT_OPTIONS */ -- 2.25.1