use bn_asm_vax.S (from netbsd); test + ok by miod

use asm code for i386, except for the CBC code, because
it is not clean PIC code.
add <machime/asm.h> support to x86unix.pl
tested by: nick (on 30386), henning, djm, tedu, jmc and more;
no shlib minor crank necessary, only internal symbols changed.

1 files changed, 42 insertions, 5 deletions

diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile
index dead23398f..18c744d706 100644
--- a/src/lib/libssl/crypto/Makefile
+++ b/src/lib/libssl/crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2003/06/02 08:45:58 markus Exp $
+# $OpenBSD: Makefile,v 1.32 2003/11/18 12:39:05 markus Exp $
 
 LIB=    crypto
 
@@ -53,17 +53,17 @@ SRCS+=	cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \
         des_old.c read2pwd.c
 SRCS+=  rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c
 SRCS+=  rc2ofb64.c                                                      
-SRCS+=  rc4_skey.c rc4_enc.c
+SRCS+=  rc4_skey.c
 #SRCS+= rc5_skey.c rc5_ecb.c rc5cfb64.c rc5cfb64.c      
 #SRCS+= rc5ofb64.c rc5_enc.c
 #SRCS+= i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c             
 #SRCS+= i_skey.c                                                        
-SRCS+=  bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c bf_enc.c               
+SRCS+=  bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c
 SRCS+=  c_skey.c c_ecb.c c_cfb64.c c_ofb64.c c_enc.c    
 SRCS+=  bn_add.c bn_div.c bn_exp.c bn_lib.c
 SRCS+=  bn_mul.c bn_print.c bn_rand.c bn_shift.c
 SRCS+=  bn_word.c bn_blind.c bn_gcd.c bn_prime.c bn_err.c
-SRCS+=  bn_sqr.c bn_recp.c bn_mont.c bn_mpi.c bn_asm.c bn_mod.c
+SRCS+=  bn_sqr.c bn_recp.c bn_mont.c bn_mpi.c bn_mod.c
 SRCS+=  bn_exp2.c bn_ctx.c
 SRCS+=  bn_sqrt.c bn_kron.c
 SRCS+=  rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c
@@ -151,7 +151,8 @@ SRCS+= ec_err.c ec_mult.c ecp_nist.c ecp_smpl.c
         ${LCRYPTO_SRC}/pkcs7 ${LCRYPTO_SRC}/x509v3 ${LCRYPTO_SRC}/pkcs12 \
         ${LCRYPTO_SRC}/comp ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}/md4 \
         ${LCRYPTO_SRC}/engine ${LCRYPTO_SRC}/dso ${LCRYPTO_SRC}/ui \
-        ${LCRYPTO_SRC}/ocsp ${LCRYPTO_SRC}/ec ${LCRYPTO_SRC}/aes ${LCRYPTO_SRC}
+        ${LCRYPTO_SRC}/ocsp ${LCRYPTO_SRC}/ec ${LCRYPTO_SRC}/aes ${LCRYPTO_SRC} \
+        ${.CURDIR}/arch/${MACHINE_ARCH}
 
 HDRS=\
         crypto/aes/aes.h \
@@ -260,6 +261,42 @@ des_enc.po:
         ${CC} ${CFLAGS} -O1 ${CPPFLAGS} -c ${.IMPSRC} -o $@
 .endif  
 
+.if (${MACHINE_ARCH} == "i386")
+CFLAGS+= -DMD5_ASM
+CFLAGS+= -DSHA1_ASM
+CFLAGS+= -DRMD160_ASM
+CFLAGS+= -DOPENBSD_CAST_ASM
+CFLAGS+= -DOPENBSD_DES_ASM
+SSLASM=\
+        bf bf-586 \
+        bn bn-586 \
+        bn co-586 \
+        cast cast-586 \
+        des des-586 \
+        md5 md5-586 \
+        rc4 rc4-586 \
+        ripemd rmd-586 \
+        sha sha1-586
+.for dir f in ${SSLASM}
+SRCS+=  ${f}.S
+GENERATED+=${f}.S
+${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl ${LCRYPTO_SRC}/perlasm/x86unix.pl
+        /usr/bin/perl -I${LCRYPTO_SRC}/perlasm:${LCRYPTO_SRC}/${dir}/asm \
+                ${LCRYPTO_SRC}/${dir}/asm/${f}.pl openbsd-elf 386 > ${.TARGET}
+.endfor
+SRCS+= bf_cbc.c 
+.else
+.if (${MACHINE_ARCH} == "vax")
+SRCS+= bf_enc.c
+SRCS+= bn_asm_vax.S
+SRCS+= rc4_enc.c        
+.else
+SRCS+= bf_enc.c 
+SRCS+= bn_asm.c
+SRCS+= rc4_enc.c        
+.endif
+.endif
+
 all beforedepend: ${GENERATED}
 
 .include <bsd.lib.mk>