summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/ssl/s3_enc.c9
-rw-r--r--src/lib/libssl/src/ssl/ssl.h4
-rw-r--r--src/lib/libssl/src/ssl/t1_enc.c6
-rw-r--r--src/lib/libssl/ssl.h4
-rw-r--r--src/lib/libssl/t1_enc.c6
5 files changed, 15 insertions, 14 deletions
diff --git a/src/lib/libssl/src/ssl/s3_enc.c b/src/lib/libssl/src/ssl/s3_enc.c
index 7e244b6c19..c30b7519fb 100644
--- a/src/lib/libssl/src/ssl/s3_enc.c
+++ b/src/lib/libssl/src/ssl/s3_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_enc.c,v 1.59 2015/02/22 15:54:27 jsing Exp $ */ 1/* $OpenBSD: s3_enc.c,v 1.60 2015/06/17 14:27:56 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 *
@@ -831,9 +831,12 @@ ssl3_alert_code(int code)
831 return (SSL3_AD_HANDSHAKE_FAILURE); 831 return (SSL3_AD_HANDSHAKE_FAILURE);
832 case SSL_AD_INTERNAL_ERROR: 832 case SSL_AD_INTERNAL_ERROR:
833 return (SSL3_AD_HANDSHAKE_FAILURE); 833 return (SSL3_AD_HANDSHAKE_FAILURE);
834 case SSL_AD_INAPPROPRIATE_FALLBACK:
835 return (TLS1_AD_INAPPROPRIATE_FALLBACK);
834 case SSL_AD_USER_CANCELLED: 836 case SSL_AD_USER_CANCELLED:
835 return (SSL3_AD_HANDSHAKE_FAILURE); 837 return (SSL3_AD_HANDSHAKE_FAILURE);
836 case SSL_AD_NO_RENEGOTIATION: return(-1); /* Don't send it :-) */ 838 case SSL_AD_NO_RENEGOTIATION:
839 return(-1); /* Don't send it :-) */
837 case SSL_AD_UNSUPPORTED_EXTENSION: 840 case SSL_AD_UNSUPPORTED_EXTENSION:
838 return (SSL3_AD_HANDSHAKE_FAILURE); 841 return (SSL3_AD_HANDSHAKE_FAILURE);
839 case SSL_AD_CERTIFICATE_UNOBTAINABLE: 842 case SSL_AD_CERTIFICATE_UNOBTAINABLE:
@@ -846,8 +849,6 @@ ssl3_alert_code(int code)
846 return (SSL3_AD_HANDSHAKE_FAILURE); 849 return (SSL3_AD_HANDSHAKE_FAILURE);
847 case SSL_AD_UNKNOWN_PSK_IDENTITY: 850 case SSL_AD_UNKNOWN_PSK_IDENTITY:
848 return (TLS1_AD_UNKNOWN_PSK_IDENTITY); 851 return (TLS1_AD_UNKNOWN_PSK_IDENTITY);
849 case SSL_AD_INAPPROPRIATE_FALLBACK:
850 return (TLS1_AD_INAPPROPRIATE_FALLBACK);
851 default: 852 default:
852 return (-1); 853 return (-1);
853 } 854 }
diff --git a/src/lib/libssl/src/ssl/ssl.h b/src/lib/libssl/src/ssl/ssl.h
index ea4bc198ea..fd50d9b69c 100644
--- a/src/lib/libssl/src/ssl/ssl.h
+++ b/src/lib/libssl/src/ssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.85 2015/06/17 14:14:20 jsing Exp $ */ 1/* $OpenBSD: ssl.h,v 1.86 2015/06/17 14:27:56 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 *
@@ -1345,6 +1345,7 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
1345#define SSL_AD_PROTOCOL_VERSION TLS1_AD_PROTOCOL_VERSION /* fatal */ 1345#define SSL_AD_PROTOCOL_VERSION TLS1_AD_PROTOCOL_VERSION /* fatal */
1346#define SSL_AD_INSUFFICIENT_SECURITY TLS1_AD_INSUFFICIENT_SECURITY/* fatal */ 1346#define SSL_AD_INSUFFICIENT_SECURITY TLS1_AD_INSUFFICIENT_SECURITY/* fatal */
1347#define SSL_AD_INTERNAL_ERROR TLS1_AD_INTERNAL_ERROR /* fatal */ 1347#define SSL_AD_INTERNAL_ERROR TLS1_AD_INTERNAL_ERROR /* fatal */
1348#define SSL_AD_INAPPROPRIATE_FALLBACK TLS1_AD_INAPPROPRIATE_FALLBACK /* fatal */
1348#define SSL_AD_USER_CANCELLED TLS1_AD_USER_CANCELLED 1349#define SSL_AD_USER_CANCELLED TLS1_AD_USER_CANCELLED
1349#define SSL_AD_NO_RENEGOTIATION TLS1_AD_NO_RENEGOTIATION 1350#define SSL_AD_NO_RENEGOTIATION TLS1_AD_NO_RENEGOTIATION
1350#define SSL_AD_UNSUPPORTED_EXTENSION TLS1_AD_UNSUPPORTED_EXTENSION 1351#define SSL_AD_UNSUPPORTED_EXTENSION TLS1_AD_UNSUPPORTED_EXTENSION
@@ -1353,7 +1354,6 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
1353#define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE 1354#define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE
1354#define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE 1355#define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE
1355#define SSL_AD_UNKNOWN_PSK_IDENTITY TLS1_AD_UNKNOWN_PSK_IDENTITY /* fatal */ 1356#define SSL_AD_UNKNOWN_PSK_IDENTITY TLS1_AD_UNKNOWN_PSK_IDENTITY /* fatal */
1356#define SSL_AD_INAPPROPRIATE_FALLBACK TLS1_AD_INAPPROPRIATE_FALLBACK /* fatal */
1357 1357
1358#define SSL_ERROR_NONE 0 1358#define SSL_ERROR_NONE 0
1359#define SSL_ERROR_SSL 1 1359#define SSL_ERROR_SSL 1
diff --git a/src/lib/libssl/src/ssl/t1_enc.c b/src/lib/libssl/src/ssl/t1_enc.c
index 6e069edd4b..b48e248b23 100644
--- a/src/lib/libssl/src/ssl/t1_enc.c
+++ b/src/lib/libssl/src/ssl/t1_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: t1_enc.c,v 1.77 2015/02/22 15:54:27 jsing Exp $ */ 1/* $OpenBSD: t1_enc.c,v 1.78 2015/06/17 14:27:56 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 *
@@ -1224,6 +1224,8 @@ tls1_alert_code(int code)
1224 return (TLS1_AD_INSUFFICIENT_SECURITY); 1224 return (TLS1_AD_INSUFFICIENT_SECURITY);
1225 case SSL_AD_INTERNAL_ERROR: 1225 case SSL_AD_INTERNAL_ERROR:
1226 return (TLS1_AD_INTERNAL_ERROR); 1226 return (TLS1_AD_INTERNAL_ERROR);
1227 case SSL_AD_INAPPROPRIATE_FALLBACK:
1228 return(TLS1_AD_INAPPROPRIATE_FALLBACK);
1227 case SSL_AD_USER_CANCELLED: 1229 case SSL_AD_USER_CANCELLED:
1228 return (TLS1_AD_USER_CANCELLED); 1230 return (TLS1_AD_USER_CANCELLED);
1229 case SSL_AD_NO_RENEGOTIATION: 1231 case SSL_AD_NO_RENEGOTIATION:
@@ -1240,8 +1242,6 @@ tls1_alert_code(int code)
1240 return (TLS1_AD_BAD_CERTIFICATE_HASH_VALUE); 1242 return (TLS1_AD_BAD_CERTIFICATE_HASH_VALUE);
1241 case SSL_AD_UNKNOWN_PSK_IDENTITY: 1243 case SSL_AD_UNKNOWN_PSK_IDENTITY:
1242 return (TLS1_AD_UNKNOWN_PSK_IDENTITY); 1244 return (TLS1_AD_UNKNOWN_PSK_IDENTITY);
1243 case SSL_AD_INAPPROPRIATE_FALLBACK:
1244 return(TLS1_AD_INAPPROPRIATE_FALLBACK);
1245 default: 1245 default:
1246 return (-1); 1246 return (-1);
1247 } 1247 }
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index ea4bc198ea..fd50d9b69c 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.85 2015/06/17 14:14:20 jsing Exp $ */ 1/* $OpenBSD: ssl.h,v 1.86 2015/06/17 14:27:56 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 *
@@ -1345,6 +1345,7 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
1345#define SSL_AD_PROTOCOL_VERSION TLS1_AD_PROTOCOL_VERSION /* fatal */ 1345#define SSL_AD_PROTOCOL_VERSION TLS1_AD_PROTOCOL_VERSION /* fatal */
1346#define SSL_AD_INSUFFICIENT_SECURITY TLS1_AD_INSUFFICIENT_SECURITY/* fatal */ 1346#define SSL_AD_INSUFFICIENT_SECURITY TLS1_AD_INSUFFICIENT_SECURITY/* fatal */
1347#define SSL_AD_INTERNAL_ERROR TLS1_AD_INTERNAL_ERROR /* fatal */ 1347#define SSL_AD_INTERNAL_ERROR TLS1_AD_INTERNAL_ERROR /* fatal */
1348#define SSL_AD_INAPPROPRIATE_FALLBACK TLS1_AD_INAPPROPRIATE_FALLBACK /* fatal */
1348#define SSL_AD_USER_CANCELLED TLS1_AD_USER_CANCELLED 1349#define SSL_AD_USER_CANCELLED TLS1_AD_USER_CANCELLED
1349#define SSL_AD_NO_RENEGOTIATION TLS1_AD_NO_RENEGOTIATION 1350#define SSL_AD_NO_RENEGOTIATION TLS1_AD_NO_RENEGOTIATION
1350#define SSL_AD_UNSUPPORTED_EXTENSION TLS1_AD_UNSUPPORTED_EXTENSION 1351#define SSL_AD_UNSUPPORTED_EXTENSION TLS1_AD_UNSUPPORTED_EXTENSION
@@ -1353,7 +1354,6 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
1353#define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE 1354#define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE
1354#define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE 1355#define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE
1355#define SSL_AD_UNKNOWN_PSK_IDENTITY TLS1_AD_UNKNOWN_PSK_IDENTITY /* fatal */ 1356#define SSL_AD_UNKNOWN_PSK_IDENTITY TLS1_AD_UNKNOWN_PSK_IDENTITY /* fatal */
1356#define SSL_AD_INAPPROPRIATE_FALLBACK TLS1_AD_INAPPROPRIATE_FALLBACK /* fatal */
1357 1357
1358#define SSL_ERROR_NONE 0 1358#define SSL_ERROR_NONE 0
1359#define SSL_ERROR_SSL 1 1359#define SSL_ERROR_SSL 1
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index 6e069edd4b..b48e248b23 100644
--- a/src/lib/libssl/t1_enc.c
+++ b/src/lib/libssl/t1_enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: t1_enc.c,v 1.77 2015/02/22 15:54:27 jsing Exp $ */ 1/* $OpenBSD: t1_enc.c,v 1.78 2015/06/17 14:27:56 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 *
@@ -1224,6 +1224,8 @@ tls1_alert_code(int code)
1224 return (TLS1_AD_INSUFFICIENT_SECURITY); 1224 return (TLS1_AD_INSUFFICIENT_SECURITY);
1225 case SSL_AD_INTERNAL_ERROR: 1225 case SSL_AD_INTERNAL_ERROR:
1226 return (TLS1_AD_INTERNAL_ERROR); 1226 return (TLS1_AD_INTERNAL_ERROR);
1227 case SSL_AD_INAPPROPRIATE_FALLBACK:
1228 return(TLS1_AD_INAPPROPRIATE_FALLBACK);
1227 case SSL_AD_USER_CANCELLED: 1229 case SSL_AD_USER_CANCELLED:
1228 return (TLS1_AD_USER_CANCELLED); 1230 return (TLS1_AD_USER_CANCELLED);
1229 case SSL_AD_NO_RENEGOTIATION: 1231 case SSL_AD_NO_RENEGOTIATION:
@@ -1240,8 +1242,6 @@ tls1_alert_code(int code)
1240 return (TLS1_AD_BAD_CERTIFICATE_HASH_VALUE); 1242 return (TLS1_AD_BAD_CERTIFICATE_HASH_VALUE);
1241 case SSL_AD_UNKNOWN_PSK_IDENTITY: 1243 case SSL_AD_UNKNOWN_PSK_IDENTITY:
1242 return (TLS1_AD_UNKNOWN_PSK_IDENTITY); 1244 return (TLS1_AD_UNKNOWN_PSK_IDENTITY);
1243 case SSL_AD_INAPPROPRIATE_FALLBACK:
1244 return(TLS1_AD_INAPPROPRIATE_FALLBACK);
1245 default: 1245 default:
1246 return (-1); 1246 return (-1);
1247 } 1247 }
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-10-31 20:35:24 +0000