changed to using NULL context like it originally was

Martyrshot · Dec 14, 2023 · 84ba043 · 84ba043
1 parent e8309d3
commit 84ba043
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c
@@ -465,13 +465,13 @@ main(int argc, char **argv) {
 		}
 	}
 #if OPENSSL_VERSION_NUMBER >= 0x30200000L && OPENSSL_API_LEVEL >= 30200
-	oqs = OSSL_PROVIDER_load(OSSL_LIB_CTX_get0_global_default(), "oqsprovider");
+	oqs = OSSL_PROVIDER_load(NULL, "oqsprovider");
 	if (oqs == NULL) {
 		ERR_print_errors_fp(stderr);
 		ERR_clear_error();
 		fatal("Failed to load oqsprovider");
 	}
-	default_provider = OSSL_PROVIDER_load(OSSL_LIB_CTX_get0_global_default(), "default");
+	default_provider = OSSL_PROVIDER_load(NULL, "default");
 	if (default_provider == NULL) {
 		OSSL_PROVIDER_unload(oqs);
 		ERR_print_errors_fp(stderr);

diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
@@ -1160,12 +1160,12 @@ main(int argc, char **argv) {
 
 	if (set_fips_mode) {
 #if OPENSSL_VERSION_NUMBER >= 0x30200000L && OPENSSL_API_LEVEL >= 30200
-		fips = OSSL_PROVIDER_load(OSSL_LIB_CTX_get0_global_default(), "fips");
+		fips = OSSL_PROVIDER_load(NULL, "fips");
 		if (fips == NULL) {
 			ERR_clear_error();
 			fatal("Failed to load FIPS provider");
 		}
-		base = OSSL_PROVIDER_load(OSSL_LIB_CTX_get0_global_default(), "base");
+		base = OSSL_PROVIDER_load(NULL, "base");
 		if (base == NULL) {
 			OSSL_PROVIDER_unload(fips);
 			ERR_clear_error();
@@ -1179,7 +1179,7 @@ main(int argc, char **argv) {
 		}
 	}
 #if OPENSSL_VERSION_NUMBER >= 0x30200000L && OPENSSL_API_LEVEL >= 30200
-	oqs = OSSL_PROVIDER_load(OSSL_LIB_CTX_get0_global_default(), "oqsprovider");
+	oqs = OSSL_PROVIDER_load(NULL, "oqsprovider");
 	if (oqs == NULL) {
 		if (fips != NULL) {
 			OSSL_PROVIDER_unload(fips);
@@ -1191,7 +1191,7 @@ main(int argc, char **argv) {
 		ERR_clear_error();
 		fatal("Failed to load oqsprovider");
 	}
-	default_provider = OSSL_PROVIDER_load(OSSL_LIB_CTX_get0_global_default(), "default");
+	default_provider = OSSL_PROVIDER_load(NULL, "default");
 	if (default_provider == NULL) {
 		OSSL_PROVIDER_unload(oqs);
 		ERR_clear_error();

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
@@ -3739,12 +3739,12 @@ main(int argc, char *argv[]) {
 
 	if (set_fips_mode) {
 #if OPENSSL_VERSION_NUMBER >= 0x30200000L && OPENSSL_API_LEVEL >= 30200
-		fips = OSSL_PROVIDER_load(OSSL_LIB_CTX_get0_global_default(), "fips");
+		fips = OSSL_PROVIDER_load(NULL, "fips");
 		if (fips == NULL) {
 			ERR_clear_error();
 			fatal("Failed to load FIPS provider");
 		}
-		base = OSSL_PROVIDER_load(OSSL_LIB_CTX_get0_global_default(), "base");
+		base = OSSL_PROVIDER_load(NULL, "base");
 		if (base == NULL) {
 			OSSL_PROVIDER_unload(fips);
 			ERR_clear_error();
@@ -3758,7 +3758,7 @@ main(int argc, char *argv[]) {
 		}
 	}
 #if OPENSSL_VERSION_NUMBER >= 0x30200000L && OPENSSL_API_LEVEL >= 30200
-	oqs = OSSL_PROVIDER_load(OSSL_LIB_CTX_get0_global_default(), "oqsprovider");
+	oqs = OSSL_PROVIDER_load(NULL, "oqsprovider");
 	if (oqs == NULL) {
 		if (fips != NULL) {
 			OSSL_PROVIDER_unload(fips);

diff --git a/bin/named/main.c b/bin/named/main.c
@@ -973,13 +973,13 @@ parse_command_line(int argc, char *argv[]) {
 			break;
 		case 'F':
 #if OPENSSL_VERSION_NUMBER >= 0x30200000L && OPENSSL_API_LEVEL >= 30200
-			fips = OSSL_PROVIDER_load(OSSL_LIB_CTX_get0_global_default(), "fips");
+			fips = OSSL_PROVIDER_load(NULL, "fips");
 			if (fips == NULL) {
 				ERR_clear_error();
 				named_main_earlyfatal(
 					"Failed to load FIPS provider");
 			}
-			base = OSSL_PROVIDER_load(OSSL_LIB_CTX_get0_global_default(), "base");
+			base = OSSL_PROVIDER_load(NULL, "base");
 			if (base == NULL) {
 				OSSL_PROVIDER_unload(fips);
 				ERR_clear_error();
@@ -1548,7 +1548,7 @@ main(int argc, char *argv[]) {
 	printf("=============================================================\n");
 	fflush(stdout);
 #if OPENSSL_VERSION_NUMER >= 0x30200000L && OPENSSL_API_LEVEL >= 30200
-	oqs = OSSL_PROVIDER_load(OSSL_LIB_CTX_get0_global_default(), "oqsprovider");
+	oqs = OSSL_PROVIDER_load(NULL, "oqsprovider");
 	if (oqs == NULL) {
 		if (fips != NULL) {
 			OSSL_PROVIDER_unload(fips);
@@ -1559,7 +1559,7 @@ main(int argc, char *argv[]) {
 		ERR_clear_error();
 		named_main_earlyfatal("failed to load oqsprovider");
 	}
-	default_provider = OSSL_PROVIDER_load(OSSL_LIB_CTX_get0_global_default(), "default");
+	default_provider = OSSL_PROVIDER_load(NULL, "default");
 	if (default_provider == NULL) {
 		OSSL_PROVIDER_unload(oqs);
 		if (fips != NULL) {