From ef3851a6adc6098adccc7dac9c2e90961097b49b Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 31 Aug 2024 16:04:22 +0000
Subject: Unifdef OPENBSD_DES_ASM.

There are no assembly implementations now.

ok tb@
---
 src/lib/libcrypto/des/des_enc.c    | 6 +-----
 src/lib/libcrypto/des/des_fcrypt.c | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/des/des_enc.c b/src/lib/libcrypto/des/des_enc.c
index 90b15d68c8..a2f07ba71c 100644
--- a/src/lib/libcrypto/des/des_enc.c
+++ b/src/lib/libcrypto/des/des_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: des_enc.c,v 1.18 2024/08/31 16:01:18 jsing Exp $ */
+/* $OpenBSD: des_enc.c,v 1.19 2024/08/31 16:04:22 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -206,8 +206,6 @@ const DES_LONG DES_SPtrans[8][64] = {
 	},
 };
 
-#ifndef OPENBSD_DES_ASM
-
 void
 DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)
 {
@@ -383,8 +381,6 @@ DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc)
 }
 LCRYPTO_ALIAS(DES_encrypt2);
 
-#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/des_fcrypt.c b/src/lib/libcrypto/des/des_fcrypt.c
index 877ffdbc83..4d06a79794 100644
--- a/src/lib/libcrypto/des/des_fcrypt.c
+++ b/src/lib/libcrypto/des/des_fcrypt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: des_fcrypt.c,v 1.1 2024/08/31 15:56:09 jsing Exp $ */
+/* $OpenBSD: des_fcrypt.c,v 1.2 2024/08/31 16:04:22 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -75,8 +75,6 @@
 #include "des_local.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),							\
@@ -149,8 +147,6 @@ fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,
 	out[1] = l;
 }
 
-#endif /* OPENBSD_DES_ASM */
-
 /* Added more values to handle illegal salt values the way normal
  * crypt() implementations do.  The patch was sent by
  * Bjorn Gronvall <bg@sics.se>
-- 
cgit v1.2.3-55-g6feb