diff options
-rw-r--r-- | src/lib/libssl/src/ssl/ssl_sess.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/ssl_sess.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_sess.c b/src/lib/libssl/src/ssl/ssl_sess.c index 80b883f786..ef5b9be56d 100644 --- a/src/lib/libssl/src/ssl/ssl_sess.c +++ b/src/lib/libssl/src/ssl/ssl_sess.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_sess.c,v 1.44 2014/12/14 15:30:50 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_sess.c,v 1.45 2015/07/21 03:34:38 doug 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 | * |
@@ -452,8 +452,6 @@ ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, | |||
452 | SSL_SESSION data; | 452 | SSL_SESSION data; |
453 | data.ssl_version = s->version; | 453 | data.ssl_version = s->version; |
454 | data.session_id_length = len; | 454 | data.session_id_length = len; |
455 | if (len == 0) | ||
456 | return 0; | ||
457 | memcpy(data.session_id, session_id, len); | 455 | memcpy(data.session_id, session_id, len); |
458 | 456 | ||
459 | CRYPTO_r_lock(CRYPTO_LOCK_SSL_CTX); | 457 | CRYPTO_r_lock(CRYPTO_LOCK_SSL_CTX); |
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c index 80b883f786..ef5b9be56d 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.44 2014/12/14 15:30:50 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_sess.c,v 1.45 2015/07/21 03:34:38 doug 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 | * |
@@ -452,8 +452,6 @@ ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, | |||
452 | SSL_SESSION data; | 452 | SSL_SESSION data; |
453 | data.ssl_version = s->version; | 453 | data.ssl_version = s->version; |
454 | data.session_id_length = len; | 454 | data.session_id_length = len; |
455 | if (len == 0) | ||
456 | return 0; | ||
457 | memcpy(data.session_id, session_id, len); | 455 | memcpy(data.session_id, session_id, len); |
458 | 456 | ||
459 | CRYPTO_r_lock(CRYPTO_LOCK_SSL_CTX); | 457 | CRYPTO_r_lock(CRYPTO_LOCK_SSL_CTX); |