libnetapi: Adapt to OpenSSL 1.1 API changes.
Surprisingly easy: X509 was made opaque, and SSL_CTX_set_ecdh_auto was removed (it is now the default internally.)
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user