From: Richard Levitte <levitte@openssl.org>
Date: Wed, 3 Feb 2016 23:22:59 +0000 (+0100)
Subject: Have OpenSSL::Test::Utils::available_protocols load configdata as well
X-Git-Tag: OpenSSL_1_1_0-pre3~290
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1fff160bc00d1c575440cd5e596fa2d4f5ab913e;p=oweals%2Fopenssl.git

Have OpenSSL::Test::Utils::available_protocols load configdata as well

Otherwise, it could typically always return an empty list, since it's
often called first if at all.

Reviewed-by: Ben Laurie <ben@openssl.org>
---

diff --git a/test/testlib/OpenSSL/Test/Utils.pm b/test/testlib/OpenSSL/Test/Utils.pm
index c0248322a7..8f75013a6c 100644
--- a/test/testlib/OpenSSL/Test/Utils.pm
+++ b/test/testlib/OpenSSL/Test/Utils.pm
@@ -130,6 +130,7 @@ sub disabled {
 }
 
 sub available_protocols {
+    load_configdata() unless $configdata_loaded;
     my $protocol_class = shift;
     if (exists $available_protocols{lc $protocol_class}) {
 	return @{$available_protocols{lc $protocol_class}}