From 2e44a02dc643d1822d558432dbf3d767fd5f05b4 Mon Sep 17 00:00:00 2001 From: tb <> Date: Sat, 18 Jan 2025 12:20:37 +0000 Subject: Remove SSL_DES and SSL_IDEA remnants ok jsing --- src/lib/libssl/ssl_ciph.c | 4 +--- 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 @@ -/* $OpenBSD: ssl_ciph.c,v 1.150 2025/01/18 10:53:04 tb Exp $ */ +/* $OpenBSD: ssl_ciph.c,v 1.151 2025/01/18 12:20:37 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1535,8 +1535,6 @@ SSL_CIPHER_get_cipher_nid(const SSL_CIPHER *c) return NID_camellia_256_cbc; case SSL_CHACHA20POLY1305: return NID_chacha20_poly1305; - case SSL_DES: - return NID_des_cbc; case SSL_RC4: return NID_rc4; 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 @@ -/* $OpenBSD: ssl_local.h,v 1.25 2025/01/18 10:53:04 tb Exp $ */ +/* $OpenBSD: ssl_local.h,v 1.26 2025/01/18 12:20:37 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -207,10 +207,8 @@ __BEGIN_HIDDEN_DECLS #define SSL_aTLS1_3 0x00000400L /* TLSv1.3 authentication */ /* Bits for algorithm_enc (symmetric encryption) */ -#define SSL_DES 0x00000001L #define SSL_3DES 0x00000002L #define SSL_RC4 0x00000004L -#define SSL_IDEA 0x00000008L #define SSL_eNULL 0x00000010L #define SSL_AES128 0x00000020L #define SSL_AES256 0x00000040L -- cgit v1.2.3-55-g6feb