diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2024-08-31 16:04:23 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2024-08-31 16:04:23 +0000 |
| commit | 188fa445223add1dcb7b5bd2f9eba2d9abe0992f (patch) | |
| tree | 8485cc5853f544706639455958ca0e2b40178159 /lib/libcrypto | |
| parent | 503781ce41ed686434763a17f109d69d48d8765c (diff) | |
Unifdef OPENBSD_DES_ASM.
There are no assembly implementations now.
ok tb@
Diffstat (limited to 'lib/libcrypto')
| -rw-r--r-- | lib/libcrypto/des/des_enc.c | 6 | ||||
| -rw-r--r-- | lib/libcrypto/des/des_fcrypt.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/lib/libcrypto/des/des_enc.c b/lib/libcrypto/des/des_enc.c index 90b15d68c8e..a2f07ba71cc 100644 --- a/lib/libcrypto/des/des_enc.c +++ b/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/lib/libcrypto/des/des_fcrypt.c b/lib/libcrypto/des/des_fcrypt.c index 877ffdbc835..4d06a79794f 100644 --- a/lib/libcrypto/des/des_fcrypt.c +++ b/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> |