From a5e8bdf9de5d2afc1a4b51d171bfe54e98eecae9 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 23 Jul 2021 20:50:29 +0000 Subject: 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 Date: Thu Jun 9 21:57:36 2016 -0400 --- lib/libcrypto/x509/x509_trs.c | 6 +----- 1 file changed, 1 insertion(+), 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; } -- cgit v1.2.3