X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=shlib%2Flinux.sh;h=f80292d90c59d07c2f0166e6074edd554afec8d8;hp=4d2b98d2c1a05a636c284aed06d90f0265ecd970;hb=bc2646ef1103c12d19ec153b5d0a9769f2732e52;hpb=eda1f21f1af8b6f77327e7b37573af9c1ba73726

diff --git a/shlib/linux.sh b/shlib/linux.sh
index 4d2b98d2c1..f80292d90c 100644
--- a/shlib/linux.sh
+++ b/shlib/linux.sh
@@ -3,13 +3,13 @@
 echo "#define DATE      \"`date`\"" >crypto/date.h
 
 major="0"
-minor="8.0"
+minor="8.2"
 slib=libssl
 clib=libcrypto
 CC=gcc
 CPP='gcc -E'
 AS=as
-FLAGS='-DTERMIO -O3 -DL_ENDIAN -fomit-frame-pointer -m486 -Wall'
+FLAGS='-DX86_ASM -DTERMIO -O3 -DL_ENDIAN -fomit-frame-pointer -m486 -Wall'
 #FLAGS='-DTERMIO -g2 -ggdb -DL_ENDIAN -m486 -Wall -DREF_CHECK -DCRYPTO_MDEBUG'
 INCLUDE='-Iinclude -Icrypto -Issl'
 SHFLAGS='-DPIC -fpic'
@@ -18,13 +18,13 @@ CFLAGS="$FLAGS $INCLUDE $SHFLAGS"
 ASM_OBJ="";
 
 echo compiling bignum assember
-$AS -o bn_asm.o crypto/bn/asm/x86-lnx.s
-CFLAGS="$CFLAGS -DBN_ASM"
+$CPP -DELF crypto/bn/asm/bn86unix.cpp | $AS -o bn_asm.o
+CFLAGS="$CFLAGS -DBN_ASM -DX86_ASM"
 ASM_OBJ="$ASM_OBJ bn_asm.o"
 
 echo compiling des assember
 $CPP -DELF crypto/des/asm/dx86unix.cpp | $AS -o des_enc.o
-$CPP -DELF crypto/des/asm/cx86unix.cpp | $AS -o fcrypt-b.o
+$CPP -DELF crypto/des/asm/yx86unix.cpp | $AS -o fcrypt-b.o
 CFLAGS="$CFLAGS -DDES_ASM"
 ASM_OBJ="$ASM_OBJ des_enc.o fcrypt-b.o"
 
@@ -33,12 +33,32 @@ $CPP -DELF crypto/bf/asm/bx86unix.cpp | $AS -o bf_enc.o
 CFLAGS="$CFLAGS -DBF_ASM"
 ASM_OBJ="$ASM_OBJ bf_enc.o"
 
+echo compiling cast assember
+$CPP -DELF crypto/cast/asm/cx86unix.cpp | $AS -o cast_enc.o
+CFLAGS="$CFLAGS -DCAST_ASM"
+ASM_OBJ="$ASM_OBJ cast_enc.o"
+
+echo compiling rc4 assember
+$CPP -DELF crypto/rc4/asm/rx86unix.cpp | $AS -o rc4_enc.o
+CFLAGS="$CFLAGS -DRC4_ASM"
+ASM_OBJ="$ASM_OBJ rc4_enc.o"
+
+echo compiling md5 assember
+$CPP -DELF crypto/md5/asm/mx86unix.cpp | $AS -o md5_enc.o
+CFLAGS="$CFLAGS -DMD5_ASM"
+ASM_OBJ="$ASM_OBJ md5_enc.o"
+
+echo compiling sha1 assember
+$CPP -DELF crypto/sha/asm/sx86unix.cpp | $AS -o sha1_enc.o
+CFLAGS="$CFLAGS -DSHA1_ASM"
+ASM_OBJ="$ASM_OBJ sha1_enc.o"
+
 echo compiling $clib
 $CC -c $CFLAGS -DCFLAGS="\"$FLAGS\"" -o crypto.o crypto/crypto.c
 
 echo linking $clib.so
 gcc $CFLAGS -shared -Wl,-soname,$clib.so.$major -o $clib.so.$major.$minor crypto.o $ASM_OBJ
-/bin/rm -f $clib.so $clib.$major
+/bin/rm -f $clib.so $clib.so.$major
 ln -s $clib.so.$major.$minor $clib.so
 ln -s $clib.so.$major.$minor $clib.so.$major
 
@@ -47,7 +67,7 @@ $CC -c $CFLAGS -o ssl.o ssl/ssl.c
 
 echo building $slib.so
 gcc $CFLAGS -shared -Wl,-soname,$slib.so.$major -o $slib.so.$major.$minor ssl.o
-/bin/rm -f $slib.so $slib.$mahor
+/bin/rm -f $slib.so $slib.so.$major
 ln -s $slib.so.$major.$minor $slib.so
 ln -s $slib.so.$major.$minor $slib.so.$major