diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_sess.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c index 8e285ea9b1..3ffd7078a5 100644 --- a/src/lib/libssl/ssl_sess.c +++ b/src/lib/libssl/ssl_sess.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_sess.c,v 1.40 2014/08/11 01:06:22 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_sess.c,v 1.41 2014/09/22 14:26:22 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 | * |
| @@ -375,26 +375,6 @@ sess_id_done: | |||
| 375 | return 0; | 375 | return 0; |
| 376 | } | 376 | } |
| 377 | } | 377 | } |
| 378 | if (s->tlsext_ecpointformatlist) { | ||
| 379 | free(ss->tlsext_ecpointformatlist); | ||
| 380 | if ((ss->tlsext_ecpointformatlist = malloc(s->tlsext_ecpointformatlist_length)) == NULL) { | ||
| 381 | SSLerr(SSL_F_SSL_GET_NEW_SESSION, ERR_R_MALLOC_FAILURE); | ||
| 382 | SSL_SESSION_free(ss); | ||
| 383 | return 0; | ||
| 384 | } | ||
| 385 | ss->tlsext_ecpointformatlist_length = s->tlsext_ecpointformatlist_length; | ||
| 386 | memcpy(ss->tlsext_ecpointformatlist, s->tlsext_ecpointformatlist, s->tlsext_ecpointformatlist_length); | ||
| 387 | } | ||
| 388 | if (s->tlsext_ellipticcurvelist) { | ||
| 389 | free(ss->tlsext_ellipticcurvelist); | ||
| 390 | if ((ss->tlsext_ellipticcurvelist = malloc(s->tlsext_ellipticcurvelist_length)) == NULL) { | ||
| 391 | SSLerr(SSL_F_SSL_GET_NEW_SESSION, ERR_R_MALLOC_FAILURE); | ||
| 392 | SSL_SESSION_free(ss); | ||
| 393 | return 0; | ||
| 394 | } | ||
| 395 | ss->tlsext_ellipticcurvelist_length = s->tlsext_ellipticcurvelist_length; | ||
| 396 | memcpy(ss->tlsext_ellipticcurvelist, s->tlsext_ellipticcurvelist, s->tlsext_ellipticcurvelist_length); | ||
| 397 | } | ||
| 398 | } else { | 378 | } else { |
| 399 | ss->session_id_length = 0; | 379 | ss->session_id_length = 0; |
| 400 | } | 380 | } |
