3 files changed, 22 insertions, 16 deletions

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 916ed4935c..683a550ad8 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.226 2022/02/05 14:54:10 jsing Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.227 2022/02/05 18:18:18 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -882,7 +882,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
         /* Cipher 1301 */
         {
                 .valid = 1,
-                .name = TLS1_3_TXT_AES_128_GCM_SHA256,
+                .name = TLS1_3_RFC_AES_128_GCM_SHA256,
                 .id = TLS1_3_CK_AES_128_GCM_SHA256,
                 .algorithm_mkey = SSL_kTLS1_3,
                 .algorithm_auth = SSL_aTLS1_3,
@@ -898,7 +898,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
         /* Cipher 1302 */
         {
                 .valid = 1,
-                .name = TLS1_3_TXT_AES_256_GCM_SHA384,
+                .name = TLS1_3_RFC_AES_256_GCM_SHA384,
                 .id = TLS1_3_CK_AES_256_GCM_SHA384,
                 .algorithm_mkey = SSL_kTLS1_3,
                 .algorithm_auth = SSL_aTLS1_3,
@@ -914,7 +914,7 @@ const SSL_CIPHER ssl3_ciphers[] = {
         /* Cipher 1303 */
         {
                 .valid = 1,
-                .name = TLS1_3_TXT_CHACHA20_POLY1305_SHA256,
+                .name = TLS1_3_RFC_CHACHA20_POLY1305_SHA256,
                 .id = TLS1_3_CK_CHACHA20_POLY1305_SHA256,
                 .algorithm_mkey = SSL_kTLS1_3,
                 .algorithm_auth = SSL_aTLS1_3,
diff --git a/src/lib/libssl/ssl_ciphers.c b/src/lib/libssl/ssl_ciphers.c
index 7ac40126ed..3174ae9c26 100644
--- a/src/lib/libssl/ssl_ciphers.c
+++ b/src/lib/libssl/ssl_ciphers.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ssl_ciphers.c,v 1.12 2022/02/05 14:54:10 jsing Exp $ */
+/*      $OpenBSD: ssl_ciphers.c,v 1.13 2022/02/05 18:18:18 tb Exp $ */
 /*
  * Copyright (c) 2015-2017 Doug Hogan <doug@openbsd.org>
  * Copyright (c) 2015-2018, 2020 Joel Sing <jsing@openbsd.org>
@@ -168,28 +168,28 @@ struct ssl_tls13_ciphersuite {
 
 static const struct ssl_tls13_ciphersuite ssl_tls13_ciphersuites[] = {
         {
-                .name = TLS1_3_TXT_AES_128_GCM_SHA256,
-                .alias = "TLS_AES_128_GCM_SHA256",
+                .name = TLS1_3_RFC_AES_128_GCM_SHA256,
+                .alias = TLS1_3_TXT_AES_128_GCM_SHA256,
                 .cid = TLS1_3_CK_AES_128_GCM_SHA256,
         },
         {
-                .name = TLS1_3_TXT_AES_256_GCM_SHA384,
-                .alias = "TLS_AES_256_GCM_SHA384",
+                .name = TLS1_3_RFC_AES_256_GCM_SHA384,
+                .alias = TLS1_3_TXT_AES_256_GCM_SHA384,
                 .cid = TLS1_3_CK_AES_256_GCM_SHA384,
         },
         {
-                .name = TLS1_3_TXT_CHACHA20_POLY1305_SHA256,
-                .alias = "TLS_CHACHA20_POLY1305_SHA256",
+                .name = TLS1_3_RFC_CHACHA20_POLY1305_SHA256,
+                .alias = TLS1_3_TXT_CHACHA20_POLY1305_SHA256,
                 .cid = TLS1_3_CK_CHACHA20_POLY1305_SHA256,
         },
         {
-                .name = TLS1_3_TXT_AES_128_CCM_SHA256,
-                .alias = "TLS_AES_128_CCM_SHA256",
+                .name = TLS1_3_RFC_AES_128_CCM_SHA256,
+                .alias = TLS1_3_TXT_AES_128_CCM_SHA256,
                 .cid = TLS1_3_CK_AES_128_CCM_SHA256,
         },
         {
-                .name = TLS1_3_TXT_AES_128_CCM_8_SHA256,
-                .alias = "TLS_AES_128_CCM_8_SHA256",
+                .name = TLS1_3_RFC_AES_128_CCM_8_SHA256,
+                .alias = TLS1_3_TXT_AES_128_CCM_8_SHA256,
                 .cid = TLS1_3_CK_AES_128_CCM_8_SHA256,
         },
         {
diff --git a/src/lib/libssl/tls1.h b/src/lib/libssl/tls1.h
index 90523dd0f9..547fb86e5d 100644
--- a/src/lib/libssl/tls1.h
+++ b/src/lib/libssl/tls1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls1.h,v 1.50 2021/10/15 16:48:47 jsing Exp $ */
+/* $OpenBSD: tls1.h,v 1.51 2022/02/05 18:18:18 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -722,6 +722,12 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
 #define TLS1_3_TXT_CHACHA20_POLY1305_SHA256             "AEAD-CHACHA20-POLY1305-SHA256"
 #define TLS1_3_TXT_AES_128_CCM_SHA256                   "AEAD-AES128-CCM-SHA256"
 #define TLS1_3_TXT_AES_128_CCM_8_SHA256                 "AEAD-AES128-CCM-8-SHA256"
+
+#define TLS1_3_RFC_AES_128_GCM_SHA256                   "TLS_AES_128_GCM_SHA256"
+#define TLS1_3_RFC_AES_256_GCM_SHA384                   "TLS_AES_256_GCM_SHA384"
+#define TLS1_3_RFC_CHACHA20_POLY1305_SHA256             "TLS_CHACHA20_POLY1305_SHA256"
+#define TLS1_3_RFC_AES_128_CCM_SHA256                   "TLS_AES_128_CCM_SHA256"
+#define TLS1_3_RFC_AES_128_CCM_8_SHA256                 "TLS_AES_128_CCM_8_SHA256"
 #endif
 
 #define TLS_CT_RSA_SIGN                 1