From 3cf6590e9b2b978b44c38897634f84fbf167db4f Mon Sep 17 00:00:00 2001 From: markus <> Date: Tue, 18 Nov 2003 12:39:05 +0000 Subject: 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 support to x86unix.pl tested by: nick (on 30386), henning, djm, tedu, jmc and more; no shlib minor crank necessary, only internal symbols changed. --- src/lib/libcrypto/cast/asm/cast-586.pl | 2 +- src/lib/libcrypto/cast/c_enc.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/lib/libcrypto/cast') diff --git a/src/lib/libcrypto/cast/asm/cast-586.pl b/src/lib/libcrypto/cast/asm/cast-586.pl index 6be0bfe572..0ed55d1905 100644 --- a/src/lib/libcrypto/cast/asm/cast-586.pl +++ b/src/lib/libcrypto/cast/asm/cast-586.pl @@ -28,7 +28,7 @@ $S4="CAST_S_table3"; &CAST_encrypt("CAST_encrypt",1); &CAST_encrypt("CAST_decrypt",0); -&cbc("CAST_cbc_encrypt","CAST_encrypt","CAST_decrypt",1,4,5,3,-1,-1); +&cbc("CAST_cbc_encrypt","CAST_encrypt","CAST_decrypt",1,4,5,3,-1,-1) unless $main'openbsd; &asm_finish(); diff --git a/src/lib/libcrypto/cast/c_enc.c b/src/lib/libcrypto/cast/c_enc.c index 0fe2cffecc..e80f65b698 100644 --- a/src/lib/libcrypto/cast/c_enc.c +++ b/src/lib/libcrypto/cast/c_enc.c @@ -59,6 +59,7 @@ #include #include "cast_lcl.h" +#ifndef OPENBSD_CAST_ASM void CAST_encrypt(CAST_LONG *data, CAST_KEY *key) { register CAST_LONG l,r,*k,t; @@ -122,6 +123,7 @@ void CAST_decrypt(CAST_LONG *data, CAST_KEY *key) data[1]=l&0xffffffffL; data[0]=r&0xffffffffL; } +#endif void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, CAST_KEY *ks, unsigned char *iv, int enc) -- cgit v1.2.3-55-g6feb