diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2017-04-10 16:48:44 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2017-04-10 16:48:44 +0000 |
| commit | 98257cb2c09f6b9194782de36ae200c184b5b585 (patch) | |
| tree | 1f11192da3e044e97ee6884184b98234ee202327 | |
| parent | 99f8264c352daf39a2bcd2dd8854c151cba3ba3a (diff) | |
freezero() the key block; simpler code and less of it.
| -rw-r--r-- | lib/libssl/t1_enc.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/libssl/t1_enc.c b/lib/libssl/t1_enc.c index e3ffe0472ee..ce57235cea8 100644 --- a/lib/libssl/t1_enc.c +++ b/lib/libssl/t1_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_enc.c,v 1.107 2017/03/25 13:42:29 jsing Exp $ */ +/* $OpenBSD: t1_enc.c,v 1.108 2017/04/10 16:48:43 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -152,12 +152,8 @@ int tls1_PRF(SSL *s, const unsigned char *secret, size_t secret_len, void tls1_cleanup_key_block(SSL *s) { - if (S3I(s)->tmp.key_block != NULL) { - explicit_bzero(S3I(s)->tmp.key_block, - S3I(s)->tmp.key_block_length); - free(S3I(s)->tmp.key_block); - S3I(s)->tmp.key_block = NULL; - } + freezero(S3I(s)->tmp.key_block, S3I(s)->tmp.key_block_length); + S3I(s)->tmp.key_block = NULL; S3I(s)->tmp.key_block_length = 0; } |