root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

cryptlib.c, etc.: fix linker warnings in 64-bit Darwin build.

This commit is contained in:
Andy Polyakov 2011-11-12 13:10:00 +00:00
parent 4a5397fb68
commit ff6f9f96fd
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/cryptlib.c
View File

@ -125,7 +125,7 @@ static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */
defined(__INTEL__) || \ defined(__INTEL__) || \
defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
unsigned int OPENSSL_ia32cap_P[2]; extern unsigned int OPENSSL_ia32cap_P[2];
unsigned int *OPENSSL_ia32cap_loc(void) { return OPENSSL_ia32cap_P; } unsigned int *OPENSSL_ia32cap_loc(void) { return OPENSSL_ia32cap_P; }
#if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY) #if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)
@ -164,6 +164,8 @@ void OPENSSL_cpuid_setup(void)
OPENSSL_ia32cap_P[0] = (unsigned int)vec|(1<<10); OPENSSL_ia32cap_P[0] = (unsigned int)vec|(1<<10);
OPENSSL_ia32cap_P[1] = (unsigned int)(vec>>32); OPENSSL_ia32cap_P[1] = (unsigned int)(vec>>32);
} }
#else
unsigned int OPENSSL_ia32cap_P[2];
#endif #endif
#else #else

1
crypto/perlasm/x86_64-xlate.pl
View File

@ -519,6 +519,7 @@ my %globals;
elsif ($flavour eq "mingw64") { $self->{value} = ""; } elsif ($flavour eq "mingw64") { $self->{value} = ""; }
} elsif ($dir =~ /\.comm/) { } elsif ($dir =~ /\.comm/) {
$self->{value} = "$dir\t$prefix$line"; $self->{value} = "$dir\t$prefix$line";
$self->{value} =~ s|,([0-9]+),([0-9]+)$|",$1,".log($2)/log(2)|e if ($flavour eq "macosx");
} }
$line = ""; $line = "";
return $self; return $self;

2
crypto/rc4/rc4test.c
View File

@ -121,6 +121,8 @@ int main(int argc, char *argv[])
RC4_KEY key; RC4_KEY key;
unsigned char obuf[512]; unsigned char obuf[512];
OPENSSL_cpuid_setup();
for (i=0; i<6; i++) for (i=0; i<6; i++)
{ {
RC4_set_key(&key,keys[i][0],&(keys[i][1])); RC4_set_key(&key,keys[i][0],&(keys[i][1]));

2
crypto/x86_64cpuid.pl
View File

@ -23,7 +23,7 @@ print<<___;
call OPENSSL_cpuid_setup call OPENSSL_cpuid_setup
.hidden OPENSSL_ia32cap_P .hidden OPENSSL_ia32cap_P
.comm OPENSSL_ia32cap_P,8 .comm OPENSSL_ia32cap_P,8,4
.text .text