Skip to content

Commit b25b4a7

Browse files
committed
Merge branch 'frazze/crypto/windows_support_openssl_3_6' into maint
* frazze/crypto/windows_support_openssl_3_6: crypto: support OpenSSL 3.5+ OTP-19848
2 parents 8dc1ce8 + 7cbd656 commit b25b4a7

File tree

1 file changed

+44
-0
lines changed

1 file changed

+44
-0
lines changed

lib/crypto/configure

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7581,10 +7581,12 @@ then :
75817581
then :
75827582

75837583
lib_bits=64
7584+
arch=64
75847585

75857586
else case e in #(
75867587
e)
75877588
lib_bits=32
7589+
arch=86
75887590
;;
75897591
esac
75907592
fi
@@ -7609,6 +7611,26 @@ then :
76097611

76107612
fi
76117613

7614+
# openssl 3.5+
7615+
if test -f "$dir/lib/VC/x$arch/MD/libcrypto_static.lib"
7616+
then :
7617+
7618+
static_crypto_lib_name=libcrypto
7619+
static_ssl_lib_name="libssl"
7620+
static_extra_libs="$static_extra_libs -lCRYPT32 -lWS2_32"
7621+
static_lib_dir="$dir/lib/VC/x$arch/MD"
7622+
found_static_lib=yes
7623+
fi
7624+
if test -f "$dir/lib/VC/x$arch/MD/libcrypto.lib"
7625+
then :
7626+
7627+
dynamic_crypto_lib_name=libcrypto
7628+
dynamic_ssl_lib_name="libssl"
7629+
dynamic_runtime_lib_dir="$rdir/lib/VC/x$arch/MD"
7630+
dynamic_lib_dir="$dir/lib/VC/x$arch/MD"
7631+
found_dynamic_lib=yes
7632+
fi
7633+
76127634
else case e in #(
76137635
e)
76147636
# Not windows...
@@ -8108,10 +8130,12 @@ then :
81088130
then :
81098131

81108132
lib_bits=64
8133+
arch=64
81118134

81128135
else case e in #(
81138136
e)
81148137
lib_bits=32
8138+
arch=86
81158139
;;
81168140
esac
81178141
fi
@@ -8136,6 +8160,26 @@ then :
81368160

81378161
fi
81388162

8163+
# openssl 3.5+
8164+
if test -f "$dir/lib/VC/x$arch/MD/libcrypto_static.lib"
8165+
then :
8166+
8167+
static_crypto_lib_name=libcrypto
8168+
static_ssl_lib_name="libssl"
8169+
static_extra_libs="$static_extra_libs -lCRYPT32 -lWS2_32"
8170+
static_lib_dir="$dir/lib/VC/x$arch/MD"
8171+
found_static_lib=yes
8172+
fi
8173+
if test -f "$dir/lib/VC/x$arch/MD/libcrypto.lib"
8174+
then :
8175+
8176+
dynamic_crypto_lib_name=libcrypto
8177+
dynamic_ssl_lib_name="libssl"
8178+
dynamic_runtime_lib_dir="$rdir/lib/VC/x$arch/MD"
8179+
dynamic_lib_dir="$dir/lib/VC/x$arch/MD"
8180+
found_dynamic_lib=yes
8181+
fi
8182+
81398183
else case e in #(
81408184
e)
81418185
# Not windows...

0 commit comments

Comments
 (0)