summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2020-01-24 04:38:12 +0000
committerjsing <>2020-01-24 04:38:12 +0000
commit9776854d2297224c523ba0b735113f95f450fc3b (patch)
tree70fce165ce9f6de1b90e28c5dd5ad329faee3828 /src
parent9bdb8cf2b0cdef5430b92da746812d02b3e4a0db (diff)
downloadopenbsd-9776854d2297224c523ba0b735113f95f450fc3b.tar.gz
openbsd-9776854d2297224c523ba0b735113f95f450fc3b.tar.bz2
openbsd-9776854d2297224c523ba0b735113f95f450fc3b.zip
Add strings for SSL_aTLS1_3 and SSL_kTLS1_3 to SSL_CIPHER_description().
Mkaes `openssl ciphers -v` print au and kx values for TLSv1.3 cipher suites. ok beck@ tb@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/ssl_ciph.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index ed167efffd..2eeeca033f 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.108 2019/04/04 16:44:24 jsing Exp $ */ 1/* $OpenBSD: ssl_ciph.c,v 1.109 2020/01/24 04:38:12 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 *
@@ -1383,6 +1383,9 @@ SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
1383 case SSL_kGOST: 1383 case SSL_kGOST:
1384 kx = "GOST"; 1384 kx = "GOST";
1385 break; 1385 break;
1386 case SSL_kTLS1_3:
1387 au = "TLSv1.3";
1388 break;
1386 default: 1389 default:
1387 kx = "unknown"; 1390 kx = "unknown";
1388 } 1391 }
@@ -1403,6 +1406,9 @@ SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
1403 case SSL_aGOST01: 1406 case SSL_aGOST01:
1404 au = "GOST01"; 1407 au = "GOST01";
1405 break; 1408 break;
1409 case SSL_aTLS1_3:
1410 au = "TLSv1.3";
1411 break;
1406 default: 1412 default:
1407 au = "unknown"; 1413 au = "unknown";
1408 break; 1414 break;