diff options
| author |   tb <tb@openbsd.org> | 2021-01-05 17:45:32 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2021-01-05 17:45:32 +0000 |
| commit | e679198cb3e4111ec6994dc03c005e82a11e96c6 (patch) | |
| tree | 42c1d22c75023c4420b108bff2d3510c736cb980 /lib/libssl/tls13_key_schedule.c | |
| parent | Convert tls13_secrets_{create,destroy}() to tls13_secret_{init,cleanup}() (diff) | |
| download | wireguard-openbsd-e679198cb3e4111ec6994dc03c005e82a11e96c6.tar.xz wireguard-openbsd-e679198cb3e4111ec6994dc03c005e82a11e96c6.zip | |
Move tls13_secrets_destroy() below _create()
ok jsing
Diffstat (limited to 'lib/libssl/tls13_key_schedule.c')
| -rw-r--r-- | lib/libssl/tls13_key_schedule.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/lib/libssl/tls13_key_schedule.c b/lib/libssl/tls13_key_schedule.c index ab8e99a293b..bce87a7ea92 100644 --- a/lib/libssl/tls13_key_schedule.c +++ b/lib/libssl/tls13_key_schedule.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls13_key_schedule.c,v 1.11 2021/01/05 17:43:13 tb Exp $ */ +/* $OpenBSD: tls13_key_schedule.c,v 1.12 2021/01/05 17:45:32 tb Exp $ */ /* Copyright (c) 2018, Bob Beck <beck@openbsd.org> * * Permission to use, copy, modify, and/or distribute this software for any @@ -47,34 +47,6 @@ tls13_secret_cleanup(struct tls13_secret *secret) secret->len = 0; } -void -tls13_secrets_destroy(struct tls13_secrets *secrets) -{ - if (secrets == NULL) - return; - - /* you can never be too sure :) */ - tls13_secret_cleanup(&secrets->zeros); - tls13_secret_cleanup(&secrets->empty_hash); - - tls13_secret_cleanup(&secrets->extracted_early); - tls13_secret_cleanup(&secrets->binder_key); - tls13_secret_cleanup(&secrets->client_early_traffic); - tls13_secret_cleanup(&secrets->early_exporter_master); - tls13_secret_cleanup(&secrets->derived_early); - tls13_secret_cleanup(&secrets->extracted_handshake); - tls13_secret_cleanup(&secrets->client_handshake_traffic); - tls13_secret_cleanup(&secrets->server_handshake_traffic); - tls13_secret_cleanup(&secrets->derived_handshake); - tls13_secret_cleanup(&secrets->extracted_master); - tls13_secret_cleanup(&secrets->client_application_traffic); - tls13_secret_cleanup(&secrets->server_application_traffic); - tls13_secret_cleanup(&secrets->exporter_master); - tls13_secret_cleanup(&secrets->resumption_master); - - freezero(secrets, sizeof(struct tls13_secrets)); -} - /* * Allocate a set of secrets for a key schedule using * a size of hash_length from RFC 8446 section 7.1. @@ -157,6 +129,34 @@ tls13_secrets_create(const EVP_MD *digest, int resumption) return NULL; } +void +tls13_secrets_destroy(struct tls13_secrets *secrets) +{ + if (secrets == NULL) + return; + + /* you can never be too sure :) */ + tls13_secret_cleanup(&secrets->zeros); + tls13_secret_cleanup(&secrets->empty_hash); + + tls13_secret_cleanup(&secrets->extracted_early); + tls13_secret_cleanup(&secrets->binder_key); + tls13_secret_cleanup(&secrets->client_early_traffic); + tls13_secret_cleanup(&secrets->early_exporter_master); + tls13_secret_cleanup(&secrets->derived_early); + tls13_secret_cleanup(&secrets->extracted_handshake); + tls13_secret_cleanup(&secrets->client_handshake_traffic); + tls13_secret_cleanup(&secrets->server_handshake_traffic); + tls13_secret_cleanup(&secrets->derived_handshake); + tls13_secret_cleanup(&secrets->extracted_master); + tls13_secret_cleanup(&secrets->client_application_traffic); + tls13_secret_cleanup(&secrets->server_application_traffic); + tls13_secret_cleanup(&secrets->exporter_master); + tls13_secret_cleanup(&secrets->resumption_master); + + freezero(secrets, sizeof(struct tls13_secrets)); +} + int tls13_hkdf_expand_label(struct tls13_secret *out, const EVP_MD *digest, const struct tls13_secret *secret, const char *label, |