From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 1 Jun 2015 19:48:48 +0000 (+0200)
Subject: When manual PKCS #11 configuration is requested don't initialize other providers
X-Git-Tag: gnutls_3_4_2~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0e533e8dc8eb852f0cbcfa7de39cdaa45233e68;p=thirdparty%2Fgnutls.git

When manual PKCS #11 configuration is requested don't initialize other providers
---

diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 730d094b0c..a9a27b3f6c 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -267,7 +267,6 @@ int _gnutls_pkcs11_check_init(void)
 		return ret;
 	}
 
-	providers_initialized = 1;
 	_gnutls_debug_log("Initializing PKCS #11 modules\n");
 	ret = gnutls_pkcs11_init(GNUTLS_PKCS11_FLAG_AUTO, NULL);
 
@@ -768,14 +767,19 @@ gnutls_pkcs11_init(unsigned int flags, const char *deprecated_config_file)
 				      p11_kit_pin_file_callback, NULL,
 				      NULL);
 
-	if (flags == GNUTLS_PKCS11_FLAG_MANUAL)
+	if (flags == GNUTLS_PKCS11_FLAG_MANUAL) {
+		/* if manual configuration is requested then don't
+		 * bother loading any other providers */
+		providers_initialized = 1;
 		return 0;
-	else if (flags & GNUTLS_PKCS11_FLAG_AUTO) {
+	 } else if (flags & GNUTLS_PKCS11_FLAG_AUTO) {
 		if (deprecated_config_file == NULL)
 			ret = auto_load();
 
 		compat_load(deprecated_config_file);
 
+		providers_initialized = 1;
+
 		return ret;
 	}