diff options
author | jsing <> | 2017-04-14 15:32:41 +0000 |
---|---|---|
committer | jsing <> | 2017-04-14 15:32:41 +0000 |
commit | ce75be4653a36ffdd6a017b3ac27f2a675a292bf (patch) | |
tree | e4758b33455a9287ceb5d68981cd637dde463e03 /src/lib | |
parent | a29ea9493e3fffec71884a61808d2e634579001c (diff) | |
download | openbsd-ce75be4653a36ffdd6a017b3ac27f2a675a292bf.tar.gz openbsd-ce75be4653a36ffdd6a017b3ac27f2a675a292bf.tar.bz2 openbsd-ce75be4653a36ffdd6a017b3ac27f2a675a292bf.zip |
Use freezero(3) when cleaning up session tickets - not only does it require
less code, but there is also a potential performance gain since they can be
larger allocations.
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libssl/ssl_srvr.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c index 31b869e552..8ea1adf7ba 100644 --- a/src/lib/libssl/ssl_srvr.c +++ b/src/lib/libssl/ssl_srvr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_srvr.c,v 1.13 2017/04/14 15:26:53 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_srvr.c,v 1.14 2017/04/14 15:32:41 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 | * |
@@ -2696,17 +2696,14 @@ ssl3_send_newsession_ticket(SSL *s) | |||
2696 | 2696 | ||
2697 | s->internal->state = SSL3_ST_SW_SESSION_TICKET_B; | 2697 | s->internal->state = SSL3_ST_SW_SESSION_TICKET_B; |
2698 | 2698 | ||
2699 | explicit_bzero(senc, slen_full); | 2699 | freezero(senc, slen_full); |
2700 | free(senc); | ||
2701 | } | 2700 | } |
2702 | 2701 | ||
2703 | /* SSL3_ST_SW_SESSION_TICKET_B */ | 2702 | /* SSL3_ST_SW_SESSION_TICKET_B */ |
2704 | return (ssl3_handshake_write(s)); | 2703 | return (ssl3_handshake_write(s)); |
2705 | 2704 | ||
2706 | err: | 2705 | err: |
2707 | if (senc != NULL) | 2706 | freezero(senc, slen_full); |
2708 | explicit_bzero(senc, slen_full); | ||
2709 | free(senc); | ||
2710 | 2707 | ||
2711 | return (-1); | 2708 | return (-1); |
2712 | } | 2709 | } |