diff options
author | tb <> | 2025-01-18 12:20:37 +0000 |
---|---|---|
committer | tb <> | 2025-01-18 12:20:37 +0000 |
commit | 2e44a02dc643d1822d558432dbf3d767fd5f05b4 (patch) | |
tree | 403e7f8ac16f65b9888beaf36a5bbe392c1b9b29 | |
parent | bc90bad6035c7e1b83e00741e609e2fc4439782f (diff) | |
download | openbsd-2e44a02dc643d1822d558432dbf3d767fd5f05b4.tar.gz openbsd-2e44a02dc643d1822d558432dbf3d767fd5f05b4.tar.bz2 openbsd-2e44a02dc643d1822d558432dbf3d767fd5f05b4.zip |
Remove SSL_DES and SSL_IDEA remnants
ok jsing
-rw-r--r-- | src/lib/libssl/ssl_ciph.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/ssl_local.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index 45b9d09c10..7d84e42cfe 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_ciph.c,v 1.150 2025/01/18 10:53:04 tb Exp $ */ | 1 | /* $OpenBSD: ssl_ciph.c,v 1.151 2025/01/18 12:20:37 tb 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 | * |
@@ -1535,8 +1535,6 @@ SSL_CIPHER_get_cipher_nid(const SSL_CIPHER *c) | |||
1535 | return NID_camellia_256_cbc; | 1535 | return NID_camellia_256_cbc; |
1536 | case SSL_CHACHA20POLY1305: | 1536 | case SSL_CHACHA20POLY1305: |
1537 | return NID_chacha20_poly1305; | 1537 | return NID_chacha20_poly1305; |
1538 | case SSL_DES: | ||
1539 | return NID_des_cbc; | ||
1540 | case SSL_RC4: | 1538 | case SSL_RC4: |
1541 | return NID_rc4; | 1539 | return NID_rc4; |
1542 | default: | 1540 | default: |
diff --git a/src/lib/libssl/ssl_local.h b/src/lib/libssl/ssl_local.h index 8c96796a63..06baedfd22 100644 --- a/src/lib/libssl/ssl_local.h +++ b/src/lib/libssl/ssl_local.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_local.h,v 1.25 2025/01/18 10:53:04 tb Exp $ */ | 1 | /* $OpenBSD: ssl_local.h,v 1.26 2025/01/18 12:20:37 tb 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 | * |
@@ -207,10 +207,8 @@ __BEGIN_HIDDEN_DECLS | |||
207 | #define SSL_aTLS1_3 0x00000400L /* TLSv1.3 authentication */ | 207 | #define SSL_aTLS1_3 0x00000400L /* TLSv1.3 authentication */ |
208 | 208 | ||
209 | /* Bits for algorithm_enc (symmetric encryption) */ | 209 | /* Bits for algorithm_enc (symmetric encryption) */ |
210 | #define SSL_DES 0x00000001L | ||
211 | #define SSL_3DES 0x00000002L | 210 | #define SSL_3DES 0x00000002L |
212 | #define SSL_RC4 0x00000004L | 211 | #define SSL_RC4 0x00000004L |
213 | #define SSL_IDEA 0x00000008L | ||
214 | #define SSL_eNULL 0x00000010L | 212 | #define SSL_eNULL 0x00000010L |
215 | #define SSL_AES128 0x00000020L | 213 | #define SSL_AES128 0x00000020L |
216 | #define SSL_AES256 0x00000040L | 214 | #define SSL_AES256 0x00000040L |