diff --git a/src/data/package_infos/riscv64/haiku b/src/data/package_infos/riscv64/haiku index 59ed57f0b6..648c73cac6 100644 --- a/src/data/package_infos/riscv64/haiku +++ b/src/data/package_infos/riscv64/haiku @@ -109,8 +109,8 @@ requires { lib:libilmimfutil #endif #ifdef HAIKU_BUILD_FEATURE_RISCV64_OPENSSL_ENABLED - lib:libssl >= 1.0.0 - lib:libcrypto >= 1.0.0 + lib:libssl + lib:libcrypto #endif #ifdef HAIKU_BUILD_FEATURE_RISCV64_FFMPEG_ENABLED lib:libavcodec >= 58 diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku index 8ed37c9ce3..89a7ecf32c 100644 --- a/src/data/package_infos/x86/haiku +++ b/src/data/package_infos/x86/haiku @@ -110,8 +110,8 @@ requires { lib:libilmimfutil #endif #ifdef HAIKU_BUILD_FEATURE_X86_OPENSSL_ENABLED - lib:libssl >= 1.0.0 - lib:libcrypto >= 1.0.0 + lib:libssl + lib:libcrypto #endif #ifdef HAIKU_BUILD_FEATURE_X86_FFMPEG_ENABLED lib:libavcodec >= 58 diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku index 5fe3a7d771..5b22a74e7f 100644 --- a/src/data/package_infos/x86_64/haiku +++ b/src/data/package_infos/x86_64/haiku @@ -110,8 +110,8 @@ requires { lib:libilmimfutil #endif #ifdef HAIKU_BUILD_FEATURE_X86_64_OPENSSL_ENABLED - lib:libssl >= 1.0.0 - lib:libcrypto >= 1.0.0 + lib:libssl + lib:libcrypto #endif #ifdef HAIKU_BUILD_FEATURE_X86_64_FFMPEG_ENABLED lib:libavcodec >= 58 diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku index f75d41ad2e..e5193de24f 100644 --- a/src/data/package_infos/x86_gcc2/haiku +++ b/src/data/package_infos/x86_gcc2/haiku @@ -110,8 +110,8 @@ requires { lib:libilmimfutil #endif #ifdef HAIKU_BUILD_FEATURE_X86_GCC2_OPENSSL_ENABLED - lib:libssl >= 1.0.0 - lib:libcrypto >= 1.0.0 + lib:libssl + lib:libcrypto #endif #ifdef HAIKU_BUILD_FEATURE_X86_GCC2_FFMPEG_ENABLED lib:libavcodec >= 58 diff --git a/src/kits/network/libnetapi/Certificate.cpp b/src/kits/network/libnetapi/Certificate.cpp index 957790ddb9..5fba30dbb0 100644 --- a/src/kits/network/libnetapi/Certificate.cpp +++ b/src/kits/network/libnetapi/Certificate.cpp @@ -124,8 +124,11 @@ BCertificate::Subject() const BString BCertificate::SignatureAlgorithm() const { - int algorithmIdentifier = OBJ_obj2nid( - fPrivate->fX509->cert_info->key->algor->algorithm); + int algorithmIdentifier; + if (!X509_get_signature_info(fPrivate->fX509, NULL, &algorithmIdentifier, + NULL, NULL)) { + return BString("invalid"); + } if (algorithmIdentifier == NID_undef) return BString("undefined"); diff --git a/src/kits/network/libnetapi/SecureSocket.cpp b/src/kits/network/libnetapi/SecureSocket.cpp index fdd77311ca..5e1539c190 100644 --- a/src/kits/network/libnetapi/SecureSocket.cpp +++ b/src/kits/network/libnetapi/SecureSocket.cpp @@ -364,8 +364,6 @@ BSecureSocket::Private::_CreateContext() // broken stuff (https://wiki.openssl.org/index.php/SSL/TLS_Client) SSL_CTX_set_cipher_list(sContext, "HIGH:!aNULL:!PSK:!SRP:!MD5:!RC4"); - SSL_CTX_set_ecdh_auto(sContext, 1); - // Setup certificate verification BPath certificateStore; find_directory(B_SYSTEM_DATA_DIRECTORY, &certificateStore);