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:
Augustin Cavalier
2020-04-19 17:58:00 -04:00
parent 648cc69f8e
commit b8aadcd2df
6 changed files with 13 additions and 12 deletions
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+5 -2
View File
@@ -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);