From: tb <tb@openbsd.org>
Date: Sun, 2 Jul 2023 19:52:01 +0000 (+0000)
Subject: Clean up dynamic tables in OPENSSL_cleanup()
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=68270c64c62e5b7be6b0ab170ccfabbb8e58ca57;p=openbsd

Clean up dynamic tables in OPENSSL_cleanup()

This is not currently done in OpenSSL, but it looks more like something
that was mised rather than desired behavior. There are some thread safety
issues here, but those are rife in this codebase anyway (although I heard
claims on some versions of this lib being "fully threadsafe").

no objection jsing
---

diff --git a/lib/libcrypto/crypto_init.c b/lib/libcrypto/crypto_init.c
index 347f9542f1b..361bef41a3e 100644
--- a/lib/libcrypto/crypto_init.c
+++ b/lib/libcrypto/crypto_init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crypto_init.c,v 1.9 2023/06/19 18:32:05 tb Exp $ */
+/*	$OpenBSD: crypto_init.c,v 1.10 2023/07/02 19:52:01 tb Exp $ */
 /*
  * Copyright (c) 2018 Bob Beck <beck@openbsd.org>
  *
@@ -20,6 +20,7 @@
 #include <pthread.h>
 #include <stdio.h>
 
+#include <openssl/asn1.h>
 #include <openssl/conf.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
@@ -27,6 +28,7 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
+#include <openssl/x509v3.h>
 
 #include "cryptlib.h"
 #include "x509_issuer_cache.h"
@@ -85,6 +87,13 @@ OPENSSL_cleanup(void)
 	ENGINE_cleanup();
 #endif
 	EVP_cleanup();
+
+	ASN1_STRING_TABLE_cleanup();
+	X509V3_EXT_cleanup();
+	X509_PURPOSE_cleanup();
+	X509_TRUST_cleanup();
+	X509_VERIFY_PARAM_table_cleanup();
+
 	x509_issuer_cache_free();
 
 	crypto_init_cleaned_up = 1;