diff options
author | jsing <> | 2024-08-31 16:04:22 +0000 |
---|---|---|
committer | jsing <> | 2024-08-31 16:04:22 +0000 |
commit | ef3851a6adc6098adccc7dac9c2e90961097b49b (patch) | |
tree | dd41984d18aca0c37725de2bd5f3966d0898cd7e | |
parent | b2fbb83b42b83caf55317baccb4fce1c9bc85dd4 (diff) | |
download | openbsd-ef3851a6adc6098adccc7dac9c2e90961097b49b.tar.gz openbsd-ef3851a6adc6098adccc7dac9c2e90961097b49b.tar.bz2 openbsd-ef3851a6adc6098adccc7dac9c2e90961097b49b.zip |
Unifdef OPENBSD_DES_ASM.
There are no assembly implementations now.
ok tb@
-rw-r--r-- | src/lib/libcrypto/des/des_enc.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/des/des_fcrypt.c | 6 |
2 files changed, 2 insertions, 10 deletions
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 @@ | |||
1 | /* $OpenBSD: des_enc.c,v 1.18 2024/08/31 16:01:18 jsing Exp $ */ | 1 | /* $OpenBSD: des_enc.c,v 1.19 2024/08/31 16:04:22 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -206,8 +206,6 @@ const DES_LONG DES_SPtrans[8][64] = { | |||
206 | }, | 206 | }, |
207 | }; | 207 | }; |
208 | 208 | ||
209 | #ifndef OPENBSD_DES_ASM | ||
210 | |||
211 | void | 209 | void |
212 | DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc) | 210 | DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc) |
213 | { | 211 | { |
@@ -383,8 +381,6 @@ DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc) | |||
383 | } | 381 | } |
384 | LCRYPTO_ALIAS(DES_encrypt2); | 382 | LCRYPTO_ALIAS(DES_encrypt2); |
385 | 383 | ||
386 | #endif /* OPENBSD_DES_ASM */ | ||
387 | |||
388 | void | 384 | void |
389 | DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1, | 385 | DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1, |
390 | DES_key_schedule *ks2, DES_key_schedule *ks3) | 386 | 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 @@ | |||
1 | /* $OpenBSD: des_fcrypt.c,v 1.1 2024/08/31 15:56:09 jsing Exp $ */ | 1 | /* $OpenBSD: des_fcrypt.c,v 1.2 2024/08/31 16:04:22 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -75,8 +75,6 @@ | |||
75 | #include "des_local.h" | 75 | #include "des_local.h" |
76 | #undef DES_FCRYPT | 76 | #undef DES_FCRYPT |
77 | 77 | ||
78 | #ifndef OPENBSD_DES_ASM | ||
79 | |||
80 | #undef PERM_OP | 78 | #undef PERM_OP |
81 | #define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)), \ | 79 | #define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)), \ |
82 | (b)^=(t), \ | 80 | (b)^=(t), \ |
@@ -149,8 +147,6 @@ fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0, | |||
149 | out[1] = l; | 147 | out[1] = l; |
150 | } | 148 | } |
151 | 149 | ||
152 | #endif /* OPENBSD_DES_ASM */ | ||
153 | |||
154 | /* Added more values to handle illegal salt values the way normal | 150 | /* Added more values to handle illegal salt values the way normal |
155 | * crypt() implementations do. The patch was sent by | 151 | * crypt() implementations do. The patch was sent by |
156 | * Bjorn Gronvall <bg@sics.se> | 152 | * Bjorn Gronvall <bg@sics.se> |