diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2021-07-23 20:50:29 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2021-07-23 20:50:29 +0000 |
| commit | a5e8bdf9de5d2afc1a4b51d171bfe54e98eecae9 (patch) | |
| tree | ed5d8ad7e2417386e5d5f43e24bda87077f625b7 | |
| parent | 1b2f453df9e122b011e6d809e1c7717c6405a96e (diff) | |
Similar to x509/x509_purp.c rev. 1.5:
Delete some code from X509_TRUST_cleanup(3) that had no effect:
it called a function on static objects that returns right away
unless the argument is dynamically allocated.
Pointed out by tb@.
This commit is identical to:
OpenSSL commit 5e6e650d62af09f47d63bfdd6c92e3b16e9da644
Author: Kurt Cancemi <kurt at x64architecture dot com>
Date: Thu Jun 9 21:57:36 2016 -0400
| -rw-r--r-- | lib/libcrypto/x509/x509_trs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/libcrypto/x509/x509_trs.c b/lib/libcrypto/x509/x509_trs.c index 651dc82a520..1a60e5a3cf4 100644 --- a/lib/libcrypto/x509/x509_trs.c +++ b/lib/libcrypto/x509/x509_trs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_trs.c,v 1.23 2018/05/18 18:40:38 tb Exp $ */ +/* $OpenBSD: x509_trs.c,v 1.24 2021/07/23 20:50:28 schwarze Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -265,10 +265,6 @@ trtable_free(X509_TRUST *p) void X509_TRUST_cleanup(void) { - unsigned int i; - - for (i = 0; i < X509_TRUST_COUNT; i++) - trtable_free(trstandard + i); sk_X509_TRUST_pop_free(trtable, trtable_free); trtable = NULL; } |