Nuke ssl3_alert_code().

ok "flensing knife"

3 files changed, 3 insertions, 76 deletions

diff --git a/src/lib/libssl/src/ssl/s3_enc.c b/src/lib/libssl/src/ssl/s3_enc.c
index 324b90ba2f..2717d24398 100644
--- a/src/lib/libssl/src/ssl/s3_enc.c
+++ b/src/lib/libssl/src/ssl/s3_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_enc.c,v 1.69 2015/09/11 17:08:50 jsing Exp $ */
+/* $OpenBSD: s3_enc.c,v 1.70 2015/09/11 17:11:53 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -263,74 +263,3 @@ ssl3_record_sequence_increment(unsigned char *seq)
                         break;
         }
 }
-
-int
-ssl3_alert_code(int code)
-{
-        switch (code) {
-        case SSL_AD_CLOSE_NOTIFY:
-                return (SSL3_AD_CLOSE_NOTIFY);
-        case SSL_AD_UNEXPECTED_MESSAGE:
-                return (SSL3_AD_UNEXPECTED_MESSAGE);
-        case SSL_AD_BAD_RECORD_MAC:
-                return (SSL3_AD_BAD_RECORD_MAC);
-        case SSL_AD_DECRYPTION_FAILED:
-                return (SSL3_AD_BAD_RECORD_MAC);
-        case SSL_AD_RECORD_OVERFLOW:
-                return (SSL3_AD_BAD_RECORD_MAC);
-        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 (SSL3_AD_NO_CERTIFICATE);
-        case SSL_AD_BAD_CERTIFICATE:
-                return (SSL3_AD_BAD_CERTIFICATE);
-        case SSL_AD_UNSUPPORTED_CERTIFICATE:
-                return (SSL3_AD_UNSUPPORTED_CERTIFICATE);
-        case SSL_AD_CERTIFICATE_REVOKED:
-                return (SSL3_AD_CERTIFICATE_REVOKED);
-        case SSL_AD_CERTIFICATE_EXPIRED:
-                return (SSL3_AD_CERTIFICATE_EXPIRED);
-        case SSL_AD_CERTIFICATE_UNKNOWN:
-                return (SSL3_AD_CERTIFICATE_UNKNOWN);
-        case SSL_AD_ILLEGAL_PARAMETER:
-                return (SSL3_AD_ILLEGAL_PARAMETER);
-        case SSL_AD_UNKNOWN_CA:
-                return (SSL3_AD_BAD_CERTIFICATE);
-        case SSL_AD_ACCESS_DENIED:
-                return (SSL3_AD_HANDSHAKE_FAILURE);
-        case SSL_AD_DECODE_ERROR:
-                return (SSL3_AD_HANDSHAKE_FAILURE);
-        case SSL_AD_DECRYPT_ERROR:
-                return (SSL3_AD_HANDSHAKE_FAILURE);
-        case SSL_AD_EXPORT_RESTRICTION:
-                return (SSL3_AD_HANDSHAKE_FAILURE);
-        case SSL_AD_PROTOCOL_VERSION:
-                return (SSL3_AD_HANDSHAKE_FAILURE);
-        case SSL_AD_INSUFFICIENT_SECURITY:
-                return (SSL3_AD_HANDSHAKE_FAILURE);
-        case SSL_AD_INTERNAL_ERROR:
-                return (SSL3_AD_HANDSHAKE_FAILURE);
-        case SSL_AD_INAPPROPRIATE_FALLBACK:
-                return (TLS1_AD_INAPPROPRIATE_FALLBACK);
-        case SSL_AD_USER_CANCELLED:
-                return (SSL3_AD_HANDSHAKE_FAILURE);
-        case SSL_AD_NO_RENEGOTIATION:
-                return(-1); /* Don't send it :-) */
-        case SSL_AD_UNSUPPORTED_EXTENSION:
-                return (SSL3_AD_HANDSHAKE_FAILURE);
-        case SSL_AD_CERTIFICATE_UNOBTAINABLE:
-                return (SSL3_AD_HANDSHAKE_FAILURE);
-        case SSL_AD_UNRECOGNIZED_NAME:
-                return (SSL3_AD_HANDSHAKE_FAILURE);
-        case SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE:
-                return (SSL3_AD_HANDSHAKE_FAILURE);
-        case SSL_AD_BAD_CERTIFICATE_HASH_VALUE:
-                return (SSL3_AD_HANDSHAKE_FAILURE);
-        case SSL_AD_UNKNOWN_PSK_IDENTITY:
-                return (TLS1_AD_UNKNOWN_PSK_IDENTITY);
-        default:
-                return (-1);
-        }
-}
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index d699fd41d8..88af440f21 100644
--- a/src/lib/libssl/src/ssl/ssl_locl.h
+++ b/src/lib/libssl/src/ssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.112 2015/09/11 17:08:50 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.113 2015/09/11 17:11:53 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -782,7 +782,6 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
     const char *label, size_t llen, const unsigned char *p, size_t plen,
     int use_context);
 int tls1_alert_code(int code);
-int ssl3_alert_code(int code);
 int ssl_ok(SSL *s);
 
 int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s);
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index d699fd41d8..88af440f21 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.112 2015/09/11 17:08:50 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.113 2015/09/11 17:11:53 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -782,7 +782,6 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
     const char *label, size_t llen, const unsigned char *p, size_t plen,
     int use_context);
 int tls1_alert_code(int code);
-int ssl3_alert_code(int code);
 int ssl_ok(SSL *s);
 
 int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s);