diff options
| author | tb <> | 2022-02-08 18:05:57 +0000 |
|---|---|---|
| committer | tb <> | 2022-02-08 18:05:57 +0000 |
| commit | e56b2f642c292c251ffc94e9730d57c0bbe614d1 (patch) | |
| tree | 2ec416f33e7fadcc306a290c3600a332ce797c1e /src/regress | |
| parent | 675b233982551a22fb4a3660071198b19ce7a851 (diff) | |
| download | openbsd-e56b2f642c292c251ffc94e9730d57c0bbe614d1.tar.gz openbsd-e56b2f642c292c251ffc94e9730d57c0bbe614d1.tar.bz2 openbsd-e56b2f642c292c251ffc94e9730d57c0bbe614d1.zip | |
Garbage collect the unused hash and print kp->pubkey_hash instead of NULL.
Make sure kp is freed also on error.
ok jsing
Diffstat (limited to 'src/regress')
| -rw-r--r-- | src/regress/lib/libtls/keypair/keypairtest.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/regress/lib/libtls/keypair/keypairtest.c b/src/regress/lib/libtls/keypair/keypairtest.c index 0aa1877389..31bf7d6a5d 100644 --- a/src/regress/lib/libtls/keypair/keypairtest.c +++ b/src/regress/lib/libtls/keypair/keypairtest.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: keypairtest.c,v 1.5 2021/12/04 09:04:36 tb Exp $ */ | 1 | /* $OpenBSD: keypairtest.c,v 1.6 2022/02/08 18:05:57 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2018 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2018 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -89,7 +89,6 @@ do_keypair_tests(void) | |||
| 89 | X509 *x509_cert = NULL; | 89 | X509 *x509_cert = NULL; |
| 90 | struct tls_keypair *kp; | 90 | struct tls_keypair *kp; |
| 91 | struct tls_error err; | 91 | struct tls_error err; |
| 92 | char *hash = NULL; | ||
| 93 | int failed = 1; | 92 | int failed = 1; |
| 94 | 93 | ||
| 95 | load_file(cert_file, &cert, &cert_len); | 94 | load_file(cert_file, &cert, &cert_len); |
| @@ -126,7 +125,7 @@ do_keypair_tests(void) | |||
| 126 | goto done; | 125 | goto done; |
| 127 | if (strcmp(kp->pubkey_hash, PUBKEY_HASH) != 0) { | 126 | if (strcmp(kp->pubkey_hash, PUBKEY_HASH) != 0) { |
| 128 | fprintf(stderr, "FAIL: got pubkey hash '%s', want '%s'", | 127 | fprintf(stderr, "FAIL: got pubkey hash '%s', want '%s'", |
| 129 | hash, PUBKEY_HASH); | 128 | kp->pubkey_hash, PUBKEY_HASH); |
| 130 | goto done; | 129 | goto done; |
| 131 | } | 130 | } |
| 132 | 131 | ||
| @@ -161,7 +160,7 @@ do_keypair_tests(void) | |||
| 161 | goto done; | 160 | goto done; |
| 162 | if (strcmp(kp->pubkey_hash, PUBKEY_HASH) != 0) { | 161 | if (strcmp(kp->pubkey_hash, PUBKEY_HASH) != 0) { |
| 163 | fprintf(stderr, "FAIL: got pubkey hash '%s', want '%s'", | 162 | fprintf(stderr, "FAIL: got pubkey hash '%s', want '%s'", |
| 164 | hash, PUBKEY_HASH); | 163 | kp->pubkey_hash, PUBKEY_HASH); |
| 165 | goto done; | 164 | goto done; |
| 166 | } | 165 | } |
| 167 | 166 | ||
| @@ -179,13 +178,11 @@ do_keypair_tests(void) | |||
| 179 | goto done; | 178 | goto done; |
| 180 | } | 179 | } |
| 181 | 180 | ||
| 182 | tls_keypair_free(kp); | ||
| 183 | |||
| 184 | failed = 0; | 181 | failed = 0; |
| 185 | 182 | ||
| 186 | done: | 183 | done: |
| 184 | tls_keypair_free(kp); | ||
| 187 | X509_free(x509_cert); | 185 | X509_free(x509_cert); |
| 188 | free(hash); | ||
| 189 | free((uint8_t *)cert); | 186 | free((uint8_t *)cert); |
| 190 | free((uint8_t *)key); | 187 | free((uint8_t *)key); |
| 191 | free((uint8_t *)ocsp_staple); | 188 | free((uint8_t *)ocsp_staple); |