generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Eliminate false dependency on 386 config option is FIPS context.

Browse Source 
At the same time limit assembler support to ELF platforms [that's
what is there, ELF modules].
This commit is contained in:
Andy Polyakov
2004-12-09 22:43:29 +00:00
parent ab09133881
commit 3dd16fb7fd
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Configure
View File

@@ -1161,15 +1161,14 @@ if ($ranlib eq "")
$bn_obj = $bn_asm unless $bn_obj ne ""; $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) if ($fips)
{ {
$des_obj=$sha1_obj=""; $des_obj=$sha1_obj="";
$openssl_other_defines.="#define OPENSSL_FIPS\n"; $openssl_other_defines.="#define OPENSSL_FIPS\n";
} }
$des_obj=$des_enc unless (!$fips && $des_obj =~ /\.o$/); $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$/); $bf_obj=$bf_enc unless ($bf_obj =~ /\.o$/);
$cast_obj=$cast_enc unless ($cast_obj =~ /\.o$/); $cast_obj=$cast_enc unless ($cast_obj =~ /\.o$/);
$rc4_obj=$rc4_enc unless ($rc4_obj =~ /\.o$/); $rc4_obj=$rc4_enc unless ($rc4_obj =~ /\.o$/);

4
crypto/des/des_enc.c
View File

@@ -293,7 +293,7 @@ void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
#ifndef DES_DEFAULT_OPTIONS #ifndef DES_DEFAULT_OPTIONS
#if !defined(OPENSSL_FIPS) || !defined(I386_ONLY) #if !defined(OPENSSL_FIPS)
#undef CBC_ENC_C__DONT_UPDATE_IV #undef CBC_ENC_C__DONT_UPDATE_IV
#include "ncbc_enc.c" /* DES_ncbc_encrypt */ #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; tin[0]=tin[1]=0;
} }
#endif /* !defined(OPENSSL_FIPS) || !defined(I386_ONLY) */ #endif /* !defined(OPENSSL_FIPS) */
#endif /* DES_DEFAULT_OPTIONS */ #endif /* DES_DEFAULT_OPTIONS */