diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2021-05-16 15:21:11 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2021-05-16 15:21:11 +0000 |
| commit | 198dbb335f0ac01879406182e98d15ac51492bf2 (patch) | |
| tree | ef45cd624c78576647b97cd4e8de398e1b9b6ccb /lib | |
| parent | 3928056208067553c39d8749a4d20b6ce0570010 (diff) | |
Zero the tls12_record_protection struct instead of individual fields.
In tls12_record_protection_clear(), rather than zeroing or NULLing
individual fields once a pointer has been freed, zero the entire struct once
the pointers have been dealt with.
ok tb@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/tls12_record_layer.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/libssl/tls12_record_layer.c b/lib/libssl/tls12_record_layer.c index 652ca873a6a..82a14f7147f 100644 --- a/lib/libssl/tls12_record_layer.c +++ b/lib/libssl/tls12_record_layer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls12_record_layer.c,v 1.28 2021/05/05 19:52:00 jsing Exp $ */ +/* $OpenBSD: tls12_record_layer.c,v 1.29 2021/05/16 15:21:10 jsing Exp $ */ /* * Copyright (c) 2020 Joel Sing <jsing@openbsd.org> * @@ -48,23 +48,17 @@ tls12_record_protection_new(void) static void tls12_record_protection_clear(struct tls12_record_protection *rp) { - memset(rp->seq_num, 0, sizeof(rp->seq_num)); - if (rp->aead_ctx != NULL) { EVP_AEAD_CTX_cleanup(&rp->aead_ctx->ctx); freezero(rp->aead_ctx, sizeof(*rp->aead_ctx)); - rp->aead_ctx = NULL; } EVP_CIPHER_CTX_free(rp->cipher_ctx); - rp->cipher_ctx = NULL; - EVP_MD_CTX_free(rp->hash_ctx); - rp->hash_ctx = NULL; freezero(rp->mac_key, rp->mac_key_len); - rp->mac_key = NULL; - rp->mac_key_len = 0; + + memset(rp, 0, sizeof(*rp)); } static void |