summaryrefslogtreecommitdiff
path: root/src/lib/libssl/t1_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
-rw-r--r--src/lib/libssl/t1_lib.c35
1 files changed, 12 insertions, 23 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index b3e86c0a31..2e9d31112d 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: t1_lib.c,v 1.113 2017/01/26 10:40:21 beck Exp $ */ 1/* $OpenBSD: t1_lib.c,v 1.114 2017/01/26 12:16:13 beck 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 *
@@ -742,8 +742,7 @@ ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit)
742 int el; 742 int el;
743 743
744 if (!ssl_add_clienthello_renegotiate_ext(s, 0, &el, 0)) { 744 if (!ssl_add_clienthello_renegotiate_ext(s, 0, &el, 0)) {
745 SSLerror( 745 SSLerror(ERR_R_INTERNAL_ERROR);
746 ERR_R_INTERNAL_ERROR);
747 return NULL; 746 return NULL;
748 } 747 }
749 748
@@ -754,8 +753,7 @@ ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit)
754 s2n(el, ret); 753 s2n(el, ret);
755 754
756 if (!ssl_add_clienthello_renegotiate_ext(s, ret, &el, el)) { 755 if (!ssl_add_clienthello_renegotiate_ext(s, ret, &el, el)) {
757 SSLerror( 756 SSLerror(ERR_R_INTERNAL_ERROR);
758 ERR_R_INTERNAL_ERROR);
759 return NULL; 757 return NULL;
760 } 758 }
761 759
@@ -780,8 +778,7 @@ ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit)
780 if (formatslen > lenmax) 778 if (formatslen > lenmax)
781 return NULL; 779 return NULL;
782 if (formatslen > 255) { 780 if (formatslen > 255) {
783 SSLerror( 781 SSLerror(ERR_R_INTERNAL_ERROR);
784 ERR_R_INTERNAL_ERROR);
785 return NULL; 782 return NULL;
786 } 783 }
787 784
@@ -803,8 +800,7 @@ ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit)
803 if (curveslen * 2 > lenmax) 800 if (curveslen * 2 > lenmax)
804 return NULL; 801 return NULL;
805 if (curveslen * 2 > 65532) { 802 if (curveslen * 2 > 65532) {
806 SSLerror( 803 SSLerror(ERR_R_INTERNAL_ERROR);
807 ERR_R_INTERNAL_ERROR);
808 return NULL; 804 return NULL;
809 } 805 }
810 806
@@ -946,8 +942,7 @@ skip_ext:
946 s2n(el, ret); 942 s2n(el, ret);
947 943
948 if (ssl_add_clienthello_use_srtp_ext(s, ret, &el, el)) { 944 if (ssl_add_clienthello_use_srtp_ext(s, ret, &el, el)) {
949 SSLerror( 945 SSLerror(ERR_R_INTERNAL_ERROR);
950 ERR_R_INTERNAL_ERROR);
951 return NULL; 946 return NULL;
952 } 947 }
953 ret += el; 948 ret += el;
@@ -1025,8 +1020,7 @@ ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned char *limit)
1025 int el; 1020 int el;
1026 1021
1027 if (!ssl_add_serverhello_renegotiate_ext(s, 0, &el, 0)) { 1022 if (!ssl_add_serverhello_renegotiate_ext(s, 0, &el, 0)) {
1028 SSLerror( 1023 SSLerror(ERR_R_INTERNAL_ERROR);
1029 ERR_R_INTERNAL_ERROR);
1030 return NULL; 1024 return NULL;
1031 } 1025 }
1032 1026
@@ -1037,8 +1031,7 @@ ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned char *limit)
1037 s2n(el, ret); 1031 s2n(el, ret);
1038 1032
1039 if (!ssl_add_serverhello_renegotiate_ext(s, ret, &el, el)) { 1033 if (!ssl_add_serverhello_renegotiate_ext(s, ret, &el, el)) {
1040 SSLerror( 1034 SSLerror(ERR_R_INTERNAL_ERROR);
1041 ERR_R_INTERNAL_ERROR);
1042 return NULL; 1035 return NULL;
1043 } 1036 }
1044 1037
@@ -1061,8 +1054,7 @@ ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned char *limit)
1061 if (formatslen > lenmax) 1054 if (formatslen > lenmax)
1062 return NULL; 1055 return NULL;
1063 if (formatslen > 255) { 1056 if (formatslen > 255) {
1064 SSLerror( 1057 SSLerror(ERR_R_INTERNAL_ERROR);
1065 ERR_R_INTERNAL_ERROR);
1066 return NULL; 1058 return NULL;
1067 } 1059 }
1068 1060
@@ -1108,8 +1100,7 @@ ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned char *limit)
1108 s2n(el, ret); 1100 s2n(el, ret);
1109 1101
1110 if (ssl_add_serverhello_use_srtp_ext(s, ret, &el, el)) { 1102 if (ssl_add_serverhello_use_srtp_ext(s, ret, &el, el)) {
1111 SSLerror( 1103 SSLerror(ERR_R_INTERNAL_ERROR);
1112 ERR_R_INTERNAL_ERROR);
1113 return NULL; 1104 return NULL;
1114 } 1105 }
1115 ret += el; 1106 ret += el;
@@ -1627,8 +1618,7 @@ ri_check:
1627 1618
1628 if (!renegotiate_seen && s->internal->renegotiate) { 1619 if (!renegotiate_seen && s->internal->renegotiate) {
1629 *al = SSL_AD_HANDSHAKE_FAILURE; 1620 *al = SSL_AD_HANDSHAKE_FAILURE;
1630 SSLerror( 1621 SSLerror(SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
1631 SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
1632 return 0; 1622 return 0;
1633 } 1623 }
1634 1624
@@ -1880,8 +1870,7 @@ ri_check:
1880 if (!renegotiate_seen && 1870 if (!renegotiate_seen &&
1881 !(s->internal->options & SSL_OP_LEGACY_SERVER_CONNECT)) { 1871 !(s->internal->options & SSL_OP_LEGACY_SERVER_CONNECT)) {
1882 *al = SSL_AD_HANDSHAKE_FAILURE; 1872 *al = SSL_AD_HANDSHAKE_FAILURE;
1883 SSLerror( 1873 SSLerror(SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
1884 SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
1885 return 0; 1874 return 0;
1886 } 1875 }
1887 1876