diff options
author | jsing <> | 2021-06-13 15:51:10 +0000 |
---|---|---|
committer | jsing <> | 2021-06-13 15:51:10 +0000 |
commit | a68f4e620476f8b038ab9a99652cb85f69bdcb24 (patch) | |
tree | 5ebd628ce66629c5264eab40921c205804261165 | |
parent | 585c11d2b544684d641066bf05e3fc3734d50309 (diff) | |
download | openbsd-a68f4e620476f8b038ab9a99652cb85f69bdcb24.tar.gz openbsd-a68f4e620476f8b038ab9a99652cb85f69bdcb24.tar.bz2 openbsd-a68f4e620476f8b038ab9a99652cb85f69bdcb24.zip |
Add SSL_AD_MISSING_EXTENSION.
This is an alert that was added in TLSv1.3 - we already use it internally,
but did not provide the SSL_AD_* define previously.
ok tb@
-rw-r--r-- | src/lib/libssl/ssl.h | 3 | ||||
-rw-r--r-- | src/lib/libssl/ssl_stat.c | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 1b81c2aed3..4719a50c7e 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.193 2021/06/13 15:47:11 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.194 2021/06/13 15:51:10 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 | * |
@@ -1023,6 +1023,7 @@ int PEM_write_SSL_SESSION(FILE *fp, SSL_SESSION *x); | |||
1023 | #define SSL_AD_INAPPROPRIATE_FALLBACK 86 | 1023 | #define SSL_AD_INAPPROPRIATE_FALLBACK 86 |
1024 | #define SSL_AD_USER_CANCELLED 90 | 1024 | #define SSL_AD_USER_CANCELLED 90 |
1025 | #define SSL_AD_NO_RENEGOTIATION 100 /* Removed in TLSv1.3 */ | 1025 | #define SSL_AD_NO_RENEGOTIATION 100 /* Removed in TLSv1.3 */ |
1026 | #define SSL_AD_MISSING_EXTENSION 109 /* Added in TLSv1.3. */ | ||
1026 | #define SSL_AD_UNSUPPORTED_EXTENSION 110 | 1027 | #define SSL_AD_UNSUPPORTED_EXTENSION 110 |
1027 | #define SSL_AD_CERTIFICATE_UNOBTAINABLE 111 /* Removed in TLSv1.3 */ | 1028 | #define SSL_AD_CERTIFICATE_UNOBTAINABLE 111 /* Removed in TLSv1.3 */ |
1028 | #define SSL_AD_UNRECOGNIZED_NAME 112 | 1029 | #define SSL_AD_UNRECOGNIZED_NAME 112 |
diff --git a/src/lib/libssl/ssl_stat.c b/src/lib/libssl/ssl_stat.c index 67f5222502..b51538c1b2 100644 --- a/src/lib/libssl/ssl_stat.c +++ b/src/lib/libssl/ssl_stat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_stat.c,v 1.16 2021/06/13 15:29:19 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_stat.c,v 1.17 2021/06/13 15:51:10 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 | * |
@@ -641,6 +641,9 @@ SSL_alert_desc_string(int value) | |||
641 | case SSL_AD_NO_RENEGOTIATION: | 641 | case SSL_AD_NO_RENEGOTIATION: |
642 | str = "NR"; | 642 | str = "NR"; |
643 | break; | 643 | break; |
644 | case SSL_AD_MISSING_EXTENSION: | ||
645 | str = "ME"; | ||
646 | break; | ||
644 | case SSL_AD_UNSUPPORTED_EXTENSION: | 647 | case SSL_AD_UNSUPPORTED_EXTENSION: |
645 | str = "UE"; | 648 | str = "UE"; |
646 | break; | 649 | break; |
@@ -735,6 +738,9 @@ SSL_alert_desc_string_long(int value) | |||
735 | case SSL_AD_NO_RENEGOTIATION: | 738 | case SSL_AD_NO_RENEGOTIATION: |
736 | str = "no renegotiation"; | 739 | str = "no renegotiation"; |
737 | break; | 740 | break; |
741 | case SSL_AD_MISSING_EXTENSION: | ||
742 | str = "missing extension"; | ||
743 | break; | ||
738 | case SSL_AD_UNSUPPORTED_EXTENSION: | 744 | case SSL_AD_UNSUPPORTED_EXTENSION: |
739 | str = "unsupported extension"; | 745 | str = "unsupported extension"; |
740 | break; | 746 | break; |