Skip to content

Commit b09d5fd

Browse files
authored
Merge pull request #162 from WebFreak001/fix-3-x
fix init_matrix for all OpenSSL 3.x versions, fix #161
2 parents 61734bf + 5f677b0 commit b09d5fd

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

source/requests/ssl_adapter.d

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,14 @@ shared static this() {
197197
init_matrix[Version(2,0)] = &openssl.init1_1;
198198
init_matrix[Version(0,2)] = &openssl.init1_1; // libressl >= 2.7.1
199199
init_matrix[Version(0,3)] = &openssl.init1_1; // libressl >= 3.0.0
200-
init_matrix[Version(3,0)] = &openssl.init1_1; // 3.0.0
201-
init_matrix[Version(3,1)] = &openssl.init1_1; // 3.1
202-
auto init = init_matrix.get(openssl._ver, null);
200+
init_matrix[Version(3,0)] = &openssl.init1_1; // >=3.0
201+
auto initVer = (ver) {
202+
if (ver.major == 3 && ver.minor >= 1) // set 3.x to 3.0 for the init matrix
203+
return Version(3, 0);
204+
else
205+
return ver;
206+
}(openssl._ver);
207+
auto init = init_matrix.get(initVer, null);
203208
if ( init is null ) {
204209
throw new Exception("loading openssl: unknown version %s for init".format(openssl._ver));
205210
}

0 commit comments

Comments
 (0)