From 9b2431ea482bd036a2d576ea74c41e3a6276c338 Mon Sep 17 00:00:00 2001 From: Konrad Rosenbaum Date: Mon, 30 Jul 2018 23:14:03 +0200 Subject: [PATCH] compatibility with OpenSSL 1.1 --- conn.cpp | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/conn.cpp b/conn.cpp index 1a6391f..17f0e2e 100644 --- a/conn.cpp +++ b/conn.cpp @@ -161,7 +161,12 @@ static inline QString getserial(X509*cert) static inline QString getsigalgo(X509*cert) { - int pkey_nid = OBJ_obj2nid(cert->cert_info->key->algor->algorithm); + int pkey_nid = +#if OPENSSL_VERSION_NUMBER < 0x10100000L + OBJ_obj2nid(cert->cert_info->key->algor->algorithm); +#else + X509_get_signature_type(cert); +#endif if (pkey_nid == NID_undef) return QString(); @@ -427,8 +432,14 @@ Connection::Connection(QUrl url,ConnectionSetting set) BREATHE(); // get connection info - sslcipher=SSL_CIPHER_get_name(SSL_get_current_cipher(ssl)); - sslversion=getSSLversion(SSL_get0_session(ssl)->ssl_version); + const SSL_CIPHER*cipher=SSL_get_current_cipher(ssl); + sslcipher=SSL_CIPHER_get_name(cipher); + const SSL_SESSION*session=SSL_get0_session(ssl); +#if OPENSSL_VERSION_NUMBER < 0x10100000L + sslversion=getSSLversion(session->ssl_version); +#else + sslversion=getSSLversion(SSL_SESSION_get_protocol_version(session)); +#endif // fix protocol auto pm=set.mode(); -- 1.7.2.5