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

This is essentially Intel 32-bit compiler tune-up. To start with all

Browse Source 
available compiler versions generated bogus machine code trying to
compile new crypto/des/cfb_enc.c. Secondly, 8th version defines
__GNUC__ macro, but fails to compile *some* inline assembler correctly.
Note that all versions of icc implement MSC-like _lrot[rl] intrinsic,
which is used now instead of offensive asm. Finally, unnecessary linker
dependencies are eliminated. Most notably dependency from libirc.a
caused trouble at application start-up, if libcrypto.so is linked with
-Bsymbolic (which it is).
This commit is contained in:
Andy Polyakov 2004-03-28 21:27:47 +00:00
parent 216659eb87
commit 1a979201d5
5 changed files with 62 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Configure
View File

@ -378,7 +378,7 @@ my %table=(
# The intel boxes :-), It would be worth seeing if bsdi-gcc can use the # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the
# bn86-elf.o file file since it is hand tweaked assembler. # bn86-elf.o file file since it is hand tweaked assembler.
"linux-ia32-icc", "icc:-DL_ENDIAN -DTERMIO -O2::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-ia32-icc", "icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-pentium", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-pentium", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-ppro", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=pentiumpro -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-ppro", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=pentiumpro -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@ -1164,6 +1164,21 @@ else
$openssl_other_defines.="#define OPENSSL_NO_STATIC_ENGINE\n"; $openssl_other_defines.="#define OPENSSL_NO_STATIC_ENGINE\n";
} }
# Compiler fix-ups
if ($target =~ /icc$/)
{
my($iccver)=`$cc -V 2>&1`;
if ($iccver =~ /Version ([0-9]+)\./) { $iccver=$1; }
else { $iccver=0; }
if ($iccver>=8)
{
# Eliminate unnecessary dependency from libirc.a. This is
# essential for shared library support, as otherwise
# apps/openssl can end up in endless loop upon startup...
$cflags.=" -Dmemcpy=__builtin_memcpy -Dmemset=__builtin_memset";
}
}
if ($sys_id ne "") if ($sys_id ne "")
{ {
#$cflags="-DOPENSSL_SYSNAME_$sys_id $cflags"; #$cflags="-DOPENSSL_SYSNAME_$sys_id $cflags";

65
crypto/des/cfb_enc.c
View File

@ -58,6 +58,7 @@
#include "e_os.h" #include "e_os.h"
#include "des_locl.h" #include "des_locl.h"
#include <assert.h>
/* The input and output are loaded in multiples of 8 bits. /* The input and output are loaded in multiples of 8 bits.
* What this means is that if you hame numbits=12 and length=2 * What this means is that if you hame numbits=12 and length=2
@ -73,12 +74,22 @@ void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
{ {
register DES_LONG d0,d1,v0,v1; register DES_LONG d0,d1,v0,v1;
register unsigned long l=length; register unsigned long l=length;
register int num=numbits,n=(numbits+7)/8,i; register int num=numbits/8,n=(numbits+7)/8,i,rem=numbits%8;
DES_LONG ti[2]; DES_LONG ti[2];
unsigned char *iv; unsigned char *iv;
#ifndef L_ENDIAN
unsigned char ovec[16]; unsigned char ovec[16];
#else
unsigned int sh[4];
unsigned char *ovec=(unsigned char *)sh;
if (num > 64) return; /* I kind of count that compiler optimizes away this assertioni,*/
assert (sizeof(sh[0])==4); /* as this holds true for all, */
/* but 16-bit platforms... */
#endif
if (numbits<=0 || numbits > 64) return;
iv = &(*ivec)[0]; iv = &(*ivec)[0];
c2l(iv,v0); c2l(iv,v0);
c2l(iv,v1); c2l(iv,v1);
@ -98,29 +109,34 @@ void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
out+=n; out+=n;
/* 30-08-94 - eay - changed because l>>32 and /* 30-08-94 - eay - changed because l>>32 and
* l<<32 are bad under gcc :-( */ * l<<32 are bad under gcc :-( */
if (num == 32) if (numbits == 32)
{ v0=v1; v1=d0; } { v0=v1; v1=d0; }
else if (num == 64) else if (numbits == 64)
{ v0=d0; v1=d1; } { v0=d0; v1=d1; }
else else
{ {
#ifndef L_ENDIAN
iv=&ovec[0]; iv=&ovec[0];
l2c(v0,iv); l2c(v0,iv);
l2c(v1,iv); l2c(v1,iv);
l2c(d0,iv); l2c(d0,iv);
l2c(d1,iv); l2c(d1,iv);
/* shift ovec left most of the bits... */ #else
memmove(ovec,ovec+num/8,8+(num%8 ? 1 : 0)); sh[0]=v0, sh[1]=v1, sh[2]=d0, sh[3]=d1;
/* now the remaining bits */ #endif
if(num%8 != 0) if (rem==0)
memcpy(ovec,ovec+num,8);
else
for(i=0 ; i < 8 ; ++i) for(i=0 ; i < 8 ; ++i)
{ ovec[i]=ovec[i+num]<<rem |
ovec[i]<<=num%8; ovec[i+num+1]>>(8-rem);
ovec[i]|=ovec[i+1]>>(8-num%8); #ifdef L_ENDIAN
} v0=sh[0], v1=sh[1];
#else
iv=&ovec[0]; iv=&ovec[0];
c2l(iv,v0); c2l(iv,v0);
c2l(iv,v1); c2l(iv,v1);
#endif
} }
} }
} }
@ -136,29 +152,34 @@ void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
in+=n; in+=n;
/* 30-08-94 - eay - changed because l>>32 and /* 30-08-94 - eay - changed because l>>32 and
* l<<32 are bad under gcc :-( */ * l<<32 are bad under gcc :-( */
if (num == 32) if (numbits == 32)
{ v0=v1; v1=d0; } { v0=v1; v1=d0; }
else if (num == 64) else if (numbits == 64)
{ v0=d0; v1=d1; } { v0=d0; v1=d1; }
else else
{ {
#ifndef L_ENDIAN
iv=&ovec[0]; iv=&ovec[0];
l2c(v0,iv); l2c(v0,iv);
l2c(v1,iv); l2c(v1,iv);
l2c(d0,iv); l2c(d0,iv);
l2c(d1,iv); l2c(d1,iv);
/* shift ovec left most of the bits... */ #else
memmove(ovec,ovec+num/8,8+(num%8 ? 1 : 0)); sh[0]=v0, sh[1]=v1, sh[2]=d0, sh[3]=d1;
/* now the remaining bits */ #endif
if(num%8 != 0) if (rem==0)
memcpy (ovec,ovec+num,8);
else
for(i=0 ; i < 8 ; ++i) for(i=0 ; i < 8 ; ++i)
{ ovec[i]=ovec[i+num]<<rem |
ovec[i]<<=num%8; ovec[i+num+1]>>(8-rem);
ovec[i]|=ovec[i+1]>>(8-num%8); #ifdef L_ENDIAN
} v0=sh[0], v1=sh[1];
#else
iv=&ovec[0]; iv=&ovec[0];
c2l(iv,v0); c2l(iv,v0);
c2l(iv,v1); c2l(iv,v1);
#endif
} }
d0^=ti[0]; d0^=ti[0];
d1^=ti[1]; d1^=ti[1];

2
crypto/des/des_locl.h
View File

@ -160,7 +160,7 @@
} \ } \
} }
#if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER) #if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) || defined(__ICC)
#define ROTATE(a,n) (_lrotr(a,n)) #define ROTATE(a,n) (_lrotr(a,n))
#elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC) #elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) # if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)

4
crypto/md32_common.h
View File

@ -179,13 +179,11 @@
*/ */
#undef ROTATE #undef ROTATE
#ifndef PEDANTIC #ifndef PEDANTIC
# if 0 /* defined(_MSC_VER) */ # if defined(_MSC_VER) || defined(__ICC)
# define ROTATE(a,n) _lrotl(a,n) # define ROTATE(a,n) _lrotl(a,n)
# elif defined(__MWERKS__) # elif defined(__MWERKS__)
# if defined(__POWERPC__) # if defined(__POWERPC__)
# define ROTATE(a,n) __rlwinm(a,n,0,31) # define ROTATE(a,n) __rlwinm(a,n,0,31)
# elif defined(OPENSSL_SYSNAME_NETWARE)
# define ROTATE(a,n) _lrotl(a,n)
# elif defined(__MC68K__) # elif defined(__MC68K__)
/* Motorola specific tweak. <appro@fy.chalmers.se> */ /* Motorola specific tweak. <appro@fy.chalmers.se> */
# define ROTATE(a,n) ( n<24 ? __rol(a,n) : __ror(a,32-n) ) # define ROTATE(a,n) ( n<24 ? __rol(a,n) : __ror(a,32-n) )

2
crypto/rc5/rc5_locl.h
View File

@ -146,7 +146,7 @@
*((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
*((c)++)=(unsigned char)(((l) )&0xff)) *((c)++)=(unsigned char)(((l) )&0xff))
#if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER) #if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)) || defined(__ICC)
#define ROTATE_l32(a,n) _lrotl(a,n) #define ROTATE_l32(a,n) _lrotl(a,n)
#define ROTATE_r32(a,n) _lrotr(a,n) #define ROTATE_r32(a,n) _lrotr(a,n)
#elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC) #elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)