summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschwarze <>2021-07-23 20:50:28 +0000
committerschwarze <>2021-07-23 20:50:28 +0000
commit559b5d51242109780083205fb6906d260287fa19 (patch)
treee26c6f5905506a61d1c19b5ca0340f801a91195b
parentc08f99f4e73bbd9f63e1186ffff30c0785f91918 (diff)
downloadopenbsd-559b5d51242109780083205fb6906d260287fa19.tar.gz
openbsd-559b5d51242109780083205fb6906d260287fa19.tar.bz2
openbsd-559b5d51242109780083205fb6906d260287fa19.zip
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--src/lib/libcrypto/x509/x509_trs.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libcrypto/x509/x509_trs.c b/src/lib/libcrypto/x509/x509_trs.c
index 651dc82a52..1a60e5a3cf 100644
--- a/src/lib/libcrypto/x509/x509_trs.c
+++ b/src/lib/libcrypto/x509/x509_trs.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_trs.c,v 1.23 2018/05/18 18:40:38 tb Exp $ */ 1/* $OpenBSD: x509_trs.c,v 1.24 2021/07/23 20:50:28 schwarze Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -265,10 +265,6 @@ trtable_free(X509_TRUST *p)
265void 265void
266X509_TRUST_cleanup(void) 266X509_TRUST_cleanup(void)
267{ 267{
268 unsigned int i;
269
270 for (i = 0; i < X509_TRUST_COUNT; i++)
271 trtable_free(trstandard + i);
272 sk_X509_TRUST_pop_free(trtable, trtable_free); 268 sk_X509_TRUST_pop_free(trtable, trtable_free);
273 trtable = NULL; 269 trtable = NULL;
274} 270}