diff options
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
| -rw-r--r-- | src/lib/libssl/t1_lib.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index 85d0fa4970..01ecf9479d 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c | |||
| @@ -506,8 +506,7 @@ ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit) | |||
| 506 | if (!s->session->tlsext_tick) | 506 | if (!s->session->tlsext_tick) |
| 507 | return NULL; | 507 | return NULL; |
| 508 | memcpy(s->session->tlsext_tick, | 508 | memcpy(s->session->tlsext_tick, |
| 509 | s->tlsext_session_ticket->data, | 509 | s->tlsext_session_ticket->data, ticklen); |
| 510 | ticklen); | ||
| 511 | s->session->tlsext_ticklen = ticklen; | 510 | s->session->tlsext_ticklen = ticklen; |
| 512 | } else | 511 | } else |
| 513 | ticklen = 0; | 512 | ticklen = 0; |
| @@ -1029,7 +1028,8 @@ ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, | |||
| 1029 | *al = TLS1_AD_UNRECOGNIZED_NAME; | 1028 | *al = TLS1_AD_UNRECOGNIZED_NAME; |
| 1030 | return 0; | 1029 | return 0; |
| 1031 | } | 1030 | } |
| 1032 | if ((s->session->tlsext_hostname = malloc(len + 1)) == NULL) { | 1031 | if ((s->session->tlsext_hostname = |
| 1032 | malloc(len + 1)) == NULL) { | ||
| 1033 | *al = TLS1_AD_INTERNAL_ERROR; | 1033 | *al = TLS1_AD_INTERNAL_ERROR; |
| 1034 | return 0; | 1034 | return 0; |
| 1035 | } | 1035 | } |
| @@ -1101,7 +1101,8 @@ ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, | |||
| 1101 | s->session->tlsext_ecpointformatlist = NULL; | 1101 | s->session->tlsext_ecpointformatlist = NULL; |
| 1102 | } | 1102 | } |
| 1103 | s->session->tlsext_ecpointformatlist_length = 0; | 1103 | s->session->tlsext_ecpointformatlist_length = 0; |
| 1104 | if ((s->session->tlsext_ecpointformatlist = malloc(ecpointformatlist_length)) == NULL) { | 1104 | if ((s->session->tlsext_ecpointformatlist = |
| 1105 | malloc(ecpointformatlist_length)) == NULL) { | ||
| 1105 | *al = TLS1_AD_INTERNAL_ERROR; | 1106 | *al = TLS1_AD_INTERNAL_ERROR; |
| 1106 | return 0; | 1107 | return 0; |
| 1107 | } | 1108 | } |
| @@ -1132,7 +1133,8 @@ ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, | |||
| 1132 | return 0; | 1133 | return 0; |
| 1133 | } | 1134 | } |
| 1134 | s->session->tlsext_ellipticcurvelist_length = 0; | 1135 | s->session->tlsext_ellipticcurvelist_length = 0; |
| 1135 | if ((s->session->tlsext_ellipticcurvelist = malloc(ellipticcurvelist_length)) == NULL) { | 1136 | if ((s->session->tlsext_ellipticcurvelist = |
| 1137 | malloc(ellipticcurvelist_length)) == NULL) { | ||
| 1136 | *al = TLS1_AD_INTERNAL_ERROR; | 1138 | *al = TLS1_AD_INTERNAL_ERROR; |
| 1137 | return 0; | 1139 | return 0; |
| 1138 | } | 1140 | } |
| @@ -1423,7 +1425,8 @@ ssl_parse_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char *d, int n, | |||
| 1423 | s->session->tlsext_ecpointformatlist_length = 0; | 1425 | s->session->tlsext_ecpointformatlist_length = 0; |
| 1424 | if (s->session->tlsext_ecpointformatlist != NULL) | 1426 | if (s->session->tlsext_ecpointformatlist != NULL) |
| 1425 | free(s->session->tlsext_ecpointformatlist); | 1427 | free(s->session->tlsext_ecpointformatlist); |
| 1426 | if ((s->session->tlsext_ecpointformatlist = malloc(ecpointformatlist_length)) == NULL) { | 1428 | if ((s->session->tlsext_ecpointformatlist = |
| 1429 | malloc(ecpointformatlist_length)) == NULL) { | ||
| 1427 | *al = TLS1_AD_INTERNAL_ERROR; | 1430 | *al = TLS1_AD_INTERNAL_ERROR; |
| 1428 | return 0; | 1431 | return 0; |
| 1429 | } | 1432 | } |