From 1cc2a70b2a8b91d243c2e4ac4e779efd950db5a2 Mon Sep 17 00:00:00 2001
From: djm <>
Date: Sat, 6 Sep 2008 12:20:16 +0000
Subject: remerge local tweaks, update per-arch configuration headers, update
 Makefiles, crank shlib_version

---
 src/lib/libcrypto/des/des_enc.c  | 5 ++++-
 src/lib/libcrypto/des/fcrypt_b.c | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/lib/libcrypto/des')

diff --git a/src/lib/libcrypto/des/des_enc.c b/src/lib/libcrypto/des/des_enc.c
index 53705b9f5b..0fe4e0b2ad 100644
--- a/src/lib/libcrypto/des/des_enc.c
+++ b/src/lib/libcrypto/des/des_enc.c
@@ -58,6 +58,8 @@
 
 #include "des_locl.h"
 
+#ifndef OPENBSD_DES_ASM
+
 void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)
 	{
 	register DES_LONG l,r,t,u;
@@ -246,7 +248,8 @@ void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc)
 	data[1]=ROTATE(r,3)&0xffffffffL;
 	l=r=t=u=0;
 	}
-#endif
+
+#endif /* OPENBSD_DES_ASM */
 
 void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
 		  DES_key_schedule *ks2, DES_key_schedule *ks3)
diff --git a/src/lib/libcrypto/des/fcrypt_b.c b/src/lib/libcrypto/des/fcrypt_b.c
index 1390138787..c56b461e91 100644
--- a/src/lib/libcrypto/des/fcrypt_b.c
+++ b/src/lib/libcrypto/des/fcrypt_b.c
@@ -68,6 +68,8 @@
 #include "des_locl.h"
 #undef DES_FCRYPT
 
+#ifndef OPENBSD_DES_ASM
+
 #undef PERM_OP
 #define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
 	(b)^=(t),\
@@ -143,3 +145,4 @@ void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,
 	out[1]=l;
 	}
 
+#endif /* OPENBSD_DES_ASM */
-- 
cgit v1.2.3-55-g6feb