summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r--src/lib/libssl/ssl_lib.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index c29d6225df..5839bd8048 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_lib.c,v 1.135 2017/01/23 06:45:30 beck Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.136 2017/01/23 08:08:06 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 *
@@ -221,7 +221,7 @@ SSL_clear(SSL *s)
221 s->internal->init_buf = NULL; 221 s->internal->init_buf = NULL;
222 222
223 ssl_clear_cipher_ctx(s); 223 ssl_clear_cipher_ctx(s);
224 ssl_clear_hash_ctx(&s->internal->read_hash); 224 ssl_clear_hash_ctx(&s->read_hash);
225 ssl_clear_hash_ctx(&s->internal->write_hash); 225 ssl_clear_hash_ctx(&s->internal->write_hash);
226 226
227 s->internal->first_packet = 0; 227 s->internal->first_packet = 0;
@@ -528,7 +528,7 @@ SSL_free(SSL *s)
528 } 528 }
529 529
530 ssl_clear_cipher_ctx(s); 530 ssl_clear_cipher_ctx(s);
531 ssl_clear_hash_ctx(&s->internal->read_hash); 531 ssl_clear_hash_ctx(&s->read_hash);
532 ssl_clear_hash_ctx(&s->internal->write_hash); 532 ssl_clear_hash_ctx(&s->internal->write_hash);
533 533
534 if (s->cert != NULL) 534 if (s->cert != NULL)
@@ -2434,7 +2434,7 @@ SSL_set_accept_state(SSL *s)
2434 s->internal->handshake_func = s->method->ssl_accept; 2434 s->internal->handshake_func = s->method->ssl_accept;
2435 /* clear the current cipher */ 2435 /* clear the current cipher */
2436 ssl_clear_cipher_ctx(s); 2436 ssl_clear_cipher_ctx(s);
2437 ssl_clear_hash_ctx(&s->internal->read_hash); 2437 ssl_clear_hash_ctx(&s->read_hash);
2438 ssl_clear_hash_ctx(&s->internal->write_hash); 2438 ssl_clear_hash_ctx(&s->internal->write_hash);
2439} 2439}
2440 2440
@@ -2447,7 +2447,7 @@ SSL_set_connect_state(SSL *s)
2447 s->internal->handshake_func = s->method->ssl_connect; 2447 s->internal->handshake_func = s->method->ssl_connect;
2448 /* clear the current cipher */ 2448 /* clear the current cipher */
2449 ssl_clear_cipher_ctx(s); 2449 ssl_clear_cipher_ctx(s);
2450 ssl_clear_hash_ctx(&s->internal->read_hash); 2450 ssl_clear_hash_ctx(&s->read_hash);
2451 ssl_clear_hash_ctx(&s->internal->write_hash); 2451 ssl_clear_hash_ctx(&s->internal->write_hash);
2452} 2452}
2453 2453
@@ -2732,8 +2732,8 @@ err:
2732void 2732void
2733ssl_clear_cipher_ctx(SSL *s) 2733ssl_clear_cipher_ctx(SSL *s)
2734{ 2734{
2735 EVP_CIPHER_CTX_free(s->internal->enc_read_ctx); 2735 EVP_CIPHER_CTX_free(s->enc_read_ctx);
2736 s->internal->enc_read_ctx = NULL; 2736 s->enc_read_ctx = NULL;
2737 EVP_CIPHER_CTX_free(s->internal->enc_write_ctx); 2737 EVP_CIPHER_CTX_free(s->internal->enc_write_ctx);
2738 s->internal->enc_write_ctx = NULL; 2738 s->internal->enc_write_ctx = NULL;
2739 2739