Keep alerts sorted by alert code.

diff --git a/lib/libssl/src/ssl/s3_enc.c b/lib/libssl/src/ssl/s3_enc.c
index 7e244b6..c30b751 100644 (file)
--- a/lib/libssl/src/ssl/s3_enc.c
+++ b/lib/libssl/src/ssl/s3_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_enc.c,v 1.59 2015/02/22 15:54:27 jsing Exp $ */
+/* $OpenBSD: s3_enc.c,v 1.60 2015/06/17 14:27:56 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -831,9 +831,12 @@ ssl3_alert_code(int code)
                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_NO_RENEGOTIATION:
+               return(-1); /* Don't send it :-) */
        case SSL_AD_UNSUPPORTED_EXTENSION:
                return (SSL3_AD_HANDSHAKE_FAILURE);
        case SSL_AD_CERTIFICATE_UNOBTAINABLE:
@@ -846,8 +849,6 @@ ssl3_alert_code(int code)
                return (SSL3_AD_HANDSHAKE_FAILURE);
        case SSL_AD_UNKNOWN_PSK_IDENTITY:
                return (TLS1_AD_UNKNOWN_PSK_IDENTITY);
-       case SSL_AD_INAPPROPRIATE_FALLBACK:
-               return (TLS1_AD_INAPPROPRIATE_FALLBACK);
        default:
                return (-1);
        }

diff --git a/lib/libssl/src/ssl/ssl.h b/lib/libssl/src/ssl/ssl.h
index ea4bc19..fd50d9b 100644 (file)
--- a/lib/libssl/src/ssl/ssl.h
+++ b/lib/libssl/src/ssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.85 2015/06/17 14:14:20 jsing Exp $ */
+/* $OpenBSD: ssl.h,v 1.86 2015/06/17 14:27:56 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1345,6 +1345,7 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
 #define SSL_AD_PROTOCOL_VERSION                TLS1_AD_PROTOCOL_VERSION /* fatal */
 #define SSL_AD_INSUFFICIENT_SECURITY   TLS1_AD_INSUFFICIENT_SECURITY/* fatal */
 #define SSL_AD_INTERNAL_ERROR          TLS1_AD_INTERNAL_ERROR  /* fatal */
+#define SSL_AD_INAPPROPRIATE_FALLBACK  TLS1_AD_INAPPROPRIATE_FALLBACK /* fatal */
 #define SSL_AD_USER_CANCELLED          TLS1_AD_USER_CANCELLED
 #define SSL_AD_NO_RENEGOTIATION                TLS1_AD_NO_RENEGOTIATION
 #define SSL_AD_UNSUPPORTED_EXTENSION   TLS1_AD_UNSUPPORTED_EXTENSION
@@ -1353,7 +1354,6 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
 #define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE
 #define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE
 #define SSL_AD_UNKNOWN_PSK_IDENTITY    TLS1_AD_UNKNOWN_PSK_IDENTITY /* fatal */
-#define SSL_AD_INAPPROPRIATE_FALLBACK  TLS1_AD_INAPPROPRIATE_FALLBACK /* fatal */
 
 #define SSL_ERROR_NONE                 0
 #define SSL_ERROR_SSL                  1

diff --git a/lib/libssl/src/ssl/t1_enc.c b/lib/libssl/src/ssl/t1_enc.c
index 6e069ed..b48e248 100644 (file)
--- a/lib/libssl/src/ssl/t1_enc.c
+++ b/lib/libssl/src/ssl/t1_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_enc.c,v 1.77 2015/02/22 15:54:27 jsing Exp $ */
+/* $OpenBSD: t1_enc.c,v 1.78 2015/06/17 14:27:56 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1224,6 +1224,8 @@ tls1_alert_code(int code)
                return (TLS1_AD_INSUFFICIENT_SECURITY);
        case SSL_AD_INTERNAL_ERROR:
                return (TLS1_AD_INTERNAL_ERROR);
+       case SSL_AD_INAPPROPRIATE_FALLBACK:
+               return(TLS1_AD_INAPPROPRIATE_FALLBACK);
        case SSL_AD_USER_CANCELLED:
                return (TLS1_AD_USER_CANCELLED);
        case SSL_AD_NO_RENEGOTIATION:
@@ -1240,8 +1242,6 @@ tls1_alert_code(int code)
                return (TLS1_AD_BAD_CERTIFICATE_HASH_VALUE);
        case SSL_AD_UNKNOWN_PSK_IDENTITY:
                return (TLS1_AD_UNKNOWN_PSK_IDENTITY);
-       case SSL_AD_INAPPROPRIATE_FALLBACK:
-               return(TLS1_AD_INAPPROPRIATE_FALLBACK);
        default:
                return (-1);
        }

diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h
index ea4bc19..fd50d9b 100644 (file)
--- a/lib/libssl/ssl.h
+++ b/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.85 2015/06/17 14:14:20 jsing Exp $ */
+/* $OpenBSD: ssl.h,v 1.86 2015/06/17 14:27:56 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1345,6 +1345,7 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
 #define SSL_AD_PROTOCOL_VERSION                TLS1_AD_PROTOCOL_VERSION /* fatal */
 #define SSL_AD_INSUFFICIENT_SECURITY   TLS1_AD_INSUFFICIENT_SECURITY/* fatal */
 #define SSL_AD_INTERNAL_ERROR          TLS1_AD_INTERNAL_ERROR  /* fatal */
+#define SSL_AD_INAPPROPRIATE_FALLBACK  TLS1_AD_INAPPROPRIATE_FALLBACK /* fatal */
 #define SSL_AD_USER_CANCELLED          TLS1_AD_USER_CANCELLED
 #define SSL_AD_NO_RENEGOTIATION                TLS1_AD_NO_RENEGOTIATION
 #define SSL_AD_UNSUPPORTED_EXTENSION   TLS1_AD_UNSUPPORTED_EXTENSION
@@ -1353,7 +1354,6 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
 #define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE
 #define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE
 #define SSL_AD_UNKNOWN_PSK_IDENTITY    TLS1_AD_UNKNOWN_PSK_IDENTITY /* fatal */
-#define SSL_AD_INAPPROPRIATE_FALLBACK  TLS1_AD_INAPPROPRIATE_FALLBACK /* fatal */
 
 #define SSL_ERROR_NONE                 0
 #define SSL_ERROR_SSL                  1

diff --git a/lib/libssl/t1_enc.c b/lib/libssl/t1_enc.c
index 6e069ed..b48e248 100644 (file)
--- a/lib/libssl/t1_enc.c
+++ b/lib/libssl/t1_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_enc.c,v 1.77 2015/02/22 15:54:27 jsing Exp $ */
+/* $OpenBSD: t1_enc.c,v 1.78 2015/06/17 14:27:56 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1224,6 +1224,8 @@ tls1_alert_code(int code)
                return (TLS1_AD_INSUFFICIENT_SECURITY);
        case SSL_AD_INTERNAL_ERROR:
                return (TLS1_AD_INTERNAL_ERROR);
+       case SSL_AD_INAPPROPRIATE_FALLBACK:
+               return(TLS1_AD_INAPPROPRIATE_FALLBACK);
        case SSL_AD_USER_CANCELLED:
                return (TLS1_AD_USER_CANCELLED);
        case SSL_AD_NO_RENEGOTIATION:
@@ -1240,8 +1242,6 @@ tls1_alert_code(int code)
                return (TLS1_AD_BAD_CERTIFICATE_HASH_VALUE);
        case SSL_AD_UNKNOWN_PSK_IDENTITY:
                return (TLS1_AD_UNKNOWN_PSK_IDENTITY);
-       case SSL_AD_INAPPROPRIATE_FALLBACK:
-               return(TLS1_AD_INAPPROPRIATE_FALLBACK);
        default:
                return (-1);
        }