Remove references to obsolete alerts.

The "no_certificate" alert only existed in SSLv3, while the
"decryption_failed" and "export_restriction" alerts were removed in
TLSv1.1.

ok tb@

2 files changed, 2 insertions, 26 deletions

diff --git a/src/lib/libssl/ssl_stat.c b/src/lib/libssl/ssl_stat.c
index b813ac6896..67f5222502 100644
--- a/src/lib/libssl/ssl_stat.c
+++ b/src/lib/libssl/ssl_stat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_stat.c,v 1.15 2021/06/11 17:29:48 jsing Exp $ */
+/* $OpenBSD: ssl_stat.c,v 1.16 2021/06/13 15:29:19 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -593,9 +593,6 @@ SSL_alert_desc_string(int value)
         case SSL_AD_HANDSHAKE_FAILURE:
                 str = "HF";
                 break;
-        case SSL_AD_NO_CERTIFICATE:
-                str = "NC";
-                break;
         case SSL_AD_BAD_CERTIFICATE:
                 str = "BC";
                 break;
@@ -614,9 +611,6 @@ SSL_alert_desc_string(int value)
         case SSL_AD_ILLEGAL_PARAMETER:
                 str = "IP";
                 break;
-        case SSL_AD_DECRYPTION_FAILED:
-                str = "DC";
-                break;
         case SSL_AD_RECORD_OVERFLOW:
                 str = "RO";
                 break;
@@ -632,9 +626,6 @@ SSL_alert_desc_string(int value)
         case SSL_AD_DECRYPT_ERROR:
                 str = "CY";
                 break;
-        case SSL_AD_EXPORT_RESTRICTION:
-                str = "ER";
-                break;
         case SSL_AD_PROTOCOL_VERSION:
                 str = "PV";
                 break;
@@ -696,9 +687,6 @@ SSL_alert_desc_string_long(int value)
         case SSL_AD_HANDSHAKE_FAILURE:
                 str = "handshake failure";
                 break;
-        case SSL_AD_NO_CERTIFICATE:
-                str = "no certificate";
-                break;
         case SSL_AD_BAD_CERTIFICATE:
                 str = "bad certificate";
                 break;
@@ -717,9 +705,6 @@ SSL_alert_desc_string_long(int value)
         case SSL_AD_ILLEGAL_PARAMETER:
                 str = "illegal parameter";
                 break;
-        case SSL_AD_DECRYPTION_FAILED:
-                str = "decryption failed";
-                break;
         case SSL_AD_RECORD_OVERFLOW:
                 str = "record overflow";
                 break;
@@ -735,9 +720,6 @@ SSL_alert_desc_string_long(int value)
         case SSL_AD_DECRYPT_ERROR:
                 str = "decrypt error";
                 break;
-        case SSL_AD_EXPORT_RESTRICTION:
-                str = "export restriction";
-                break;
         case SSL_AD_PROTOCOL_VERSION:
                 str = "protocol version";
                 break;
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index 2f555f37d0..87d2f9e590 100644
--- a/src/lib/libssl/t1_enc.c
+++ b/src/lib/libssl/t1_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_enc.c,v 1.148 2021/06/11 11:13:53 jsing Exp $ */
+/* $OpenBSD: t1_enc.c,v 1.149 2021/06/13 15:29:19 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -505,16 +505,12 @@ tls1_alert_code(int code)
                 return (SSL3_AD_UNEXPECTED_MESSAGE);
         case SSL_AD_BAD_RECORD_MAC:
                 return (SSL3_AD_BAD_RECORD_MAC);
-        case SSL_AD_DECRYPTION_FAILED:
-                return (TLS1_AD_DECRYPTION_FAILED);
         case SSL_AD_RECORD_OVERFLOW:
                 return (TLS1_AD_RECORD_OVERFLOW);
         case SSL_AD_DECOMPRESSION_FAILURE:
                 return (SSL3_AD_DECOMPRESSION_FAILURE);
         case SSL_AD_HANDSHAKE_FAILURE:
                 return (SSL3_AD_HANDSHAKE_FAILURE);
-        case SSL_AD_NO_CERTIFICATE:
-                return (-1);
         case SSL_AD_BAD_CERTIFICATE:
                 return (SSL3_AD_BAD_CERTIFICATE);
         case SSL_AD_UNSUPPORTED_CERTIFICATE:
@@ -535,8 +531,6 @@ tls1_alert_code(int code)
                 return (TLS1_AD_DECODE_ERROR);
         case SSL_AD_DECRYPT_ERROR:
                 return (TLS1_AD_DECRYPT_ERROR);
-        case SSL_AD_EXPORT_RESTRICTION:
-                return (TLS1_AD_EXPORT_RESTRICTION);
         case SSL_AD_PROTOCOL_VERSION:
                 return (TLS1_AD_PROTOCOL_VERSION);
         case SSL_AD_INSUFFICIENT_SECURITY: