summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2025-01-18 10:53:04 +0000
committertb <>2025-01-18 10:53:04 +0000
commitaa6fa26115ff2935d11f05c1b2a658343a2b5106 (patch)
tree2ba6014f4507f203dabe278b3f7b0e0cb0f0ba47
parent1a105fffff0661705f080ae9472fad601052ee44 (diff)
downloadopenbsd-aa6fa26115ff2935d11f05c1b2a658343a2b5106.tar.gz
openbsd-aa6fa26115ff2935d11f05c1b2a658343a2b5106.tar.bz2
openbsd-aa6fa26115ff2935d11f05c1b2a658343a2b5106.zip
Remove last uses of SSL_aDSS
ok jsing
-rw-r--r--src/lib/libssl/ssl_ciph.c13
-rw-r--r--src/lib/libssl/ssl_local.h3
2 files changed, 2 insertions, 14 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index 8f7345f068..45b9d09c10 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.149 2024/08/31 12:46:55 jsing Exp $ */ 1/* $OpenBSD: ssl_ciph.c,v 1.150 2025/01/18 10:53:04 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 *
@@ -219,14 +219,6 @@ static const SSL_CIPHER cipher_aliases[] = {
219 .algorithm_auth = SSL_aRSA, 219 .algorithm_auth = SSL_aRSA,
220 }, 220 },
221 { 221 {
222 .name = SSL_TXT_aDSS,
223 .algorithm_auth = SSL_aDSS,
224 },
225 {
226 .name = SSL_TXT_DSS,
227 .algorithm_auth = SSL_aDSS,
228 },
229 {
230 .name = SSL_TXT_aNULL, 222 .name = SSL_TXT_aNULL,
231 .algorithm_auth = SSL_aNULL, 223 .algorithm_auth = SSL_aNULL,
232 }, 224 },
@@ -1369,9 +1361,6 @@ SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
1369 case SSL_aRSA: 1361 case SSL_aRSA:
1370 au = "RSA"; 1362 au = "RSA";
1371 break; 1363 break;
1372 case SSL_aDSS:
1373 au = "DSS";
1374 break;
1375 case SSL_aNULL: 1364 case SSL_aNULL:
1376 au = "None"; 1365 au = "None";
1377 break; 1366 break;
diff --git a/src/lib/libssl/ssl_local.h b/src/lib/libssl/ssl_local.h
index 35d9ebae93..8c96796a63 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.24 2025/01/17 22:39:42 tb Exp $ */ 1/* $OpenBSD: ssl_local.h,v 1.25 2025/01/18 10:53:04 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 *
@@ -202,7 +202,6 @@ __BEGIN_HIDDEN_DECLS
202 202
203/* Bits for algorithm_auth (server authentication) */ 203/* Bits for algorithm_auth (server authentication) */
204#define SSL_aRSA 0x00000001L /* RSA auth */ 204#define SSL_aRSA 0x00000001L /* RSA auth */
205#define SSL_aDSS 0x00000002L /* DSS auth */
206#define SSL_aNULL 0x00000004L /* no auth (i.e. use ADH or AECDH) */ 205#define SSL_aNULL 0x00000004L /* no auth (i.e. use ADH or AECDH) */
207#define SSL_aECDSA 0x00000040L /* ECDSA auth*/ 206#define SSL_aECDSA 0x00000040L /* ECDSA auth*/
208#define SSL_aTLS1_3 0x00000400L /* TLSv1.3 authentication */ 207#define SSL_aTLS1_3 0x00000400L /* TLSv1.3 authentication */