meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase/0002-Adapt-for-q_EVP_PKEY_base_id-q_EVP_PKEY_get_base_id-.patch

   1 From bb32d60ee031e29dcfd4bb22d81f6592bf308be9 Mon Sep 17 00:00:00 2001
   2 From: Dmitry Shachnev <mitya57@gmail.com>
   3 Date: Sun, 5 Dec 2021 16:07:44 +0300
   4 Subject: [PATCH] =?UTF-8?q?Adapt=20for=20q=5FEVP=5FPKEY=5Fbase=5Fid=20?=
   5  =?UTF-8?q?=E2=86=92=20q=5FEVP=5FPKEY=5Fget=5Fbase=5Fid=20rename=20in=20Op?=
   6  =?UTF-8?q?enSSL=203?=
   7 MIME-Version: 1.0
   8 Content-Type: text/plain; charset=UTF-8
   9 Content-Transfer-Encoding: 8bit
  10
  11 Based on upstream commit 4c0f81490ba0c4ec (the whole commit does not
  12 apply cleanly).
  13 ---
  14  src/network/ssl/qsslsocket_openssl_symbols.cpp | 6 ++++--
  15  src/network/ssl/qsslsocket_openssl_symbols_p.h | 4 +++-
  16  2 files changed, 7 insertions(+), 3 deletions(-)
  17
  18 diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
  19 index f343349e2c..f89f5206a3 100644
  20 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
  21 +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
  22 @@ -148,7 +148,6 @@ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
  23  DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
  24  DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
  25  DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
  26 -DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
  27  DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
  28  DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
  29  DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
  30 @@ -371,8 +370,10 @@ DEFINEFUNC(STACK_OF(X509) *, SSL_get_peer_cert_chain, SSL *a, a, return nullptr,
  31
  32  #if defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 3
  33  DEFINEFUNC(X509 *, SSL_get1_peer_certificate, SSL *a, a, return nullptr, return)
  34 +DEFINEFUNC(int, EVP_PKEY_get_base_id, const EVP_PKEY *pkey, pkey, return -1, return)
  35  #else
  36  DEFINEFUNC(X509 *, SSL_get_peer_certificate, SSL *a, a, return nullptr, return)
  37 +DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
  38  #endif // OPENSSL_VERSION_MAJOR >= 3
  39
  40  DEFINEFUNC(long, SSL_get_verify_result, const SSL *a, a, return -1, return)
  41 @@ -856,7 +857,6 @@ bool q_resolveOpenSslSymbols()
  42      RESOLVEFUNC(EVP_PKEY_CTX_new)
  43      RESOLVEFUNC(EVP_PKEY_param_check)
  44      RESOLVEFUNC(EVP_PKEY_CTX_free)
  45 -    RESOLVEFUNC(EVP_PKEY_base_id)
  46      RESOLVEFUNC(RSA_bits)
  47      RESOLVEFUNC(OPENSSL_sk_new_null)
  48      RESOLVEFUNC(OPENSSL_sk_push)
  49 @@ -1084,8 +1084,10 @@ bool q_resolveOpenSslSymbols()
  50
  51  #if defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 3
  52      RESOLVEFUNC(SSL_get1_peer_certificate)
  53 +    RESOLVEFUNC(EVP_PKEY_get_base_id)
  54  #else
  55      RESOLVEFUNC(SSL_get_peer_certificate)
  56 +    RESOLVEFUNC(EVP_PKEY_base_id)
  57  #endif // OPENSSL_VERSION_MAJOR >= 3
  58
  59      RESOLVEFUNC(SSL_get_verify_result)
  60 diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h
  61 index 000134b671..9af27ab99d 100644
  62 --- a/src/network/ssl/qsslsocket_openssl_symbols_p.h
  63 +++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h
  64 @@ -236,7 +236,6 @@ Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
  65  EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
  66  void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
  67  int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
  68 -int q_EVP_PKEY_base_id(EVP_PKEY *a);
  69  int q_RSA_bits(RSA *a);
  70  Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
  71  Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
  72 @@ -751,8 +750,11 @@ void q_SSL_CTX_set_security_level(SSL_CTX *ctx, int level);
  73  #if defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 3
  74  X509 *q_SSL_get1_peer_certificate(SSL *a);
  75  #define q_SSL_get_peer_certificate q_SSL_get1_peer_certificate
  76 +int q_EVP_PKEY_get_base_id(const EVP_PKEY *pkey);
  77 +#define q_EVP_PKEY_base_id q_EVP_PKEY_get_base_id
  78  #else
  79  X509 *q_SSL_get_peer_certificate(SSL *a);
  80 +int q_EVP_PKEY_base_id(EVP_PKEY *a);
  81  #endif // OPENSSL_VERSION_MAJOR >= 3
  82
  83  QT_END_NAMESPACE
  84 --
  85 2.35.3
  86