[neon/qt/qtbase/Neon/release] debian/patches: Add some missing changes to debian/patches/openssl3.diff.

[Dmitry Shachnev]

Git commit 732917c9cb95b9951887e76019d483206c8ab3cc by Dmitry Shachnev.
Committed on 09/12/2021 at 11:56.
Pushed by jriddell into branch 'Neon/release'.

Add some missing changes to debian/patches/openssl3.diff.

M  +25   -5    debian/patches/openssl3.diff

https://invent.kde.org/neon/qt/qtbase/commit/732917c9cb95b9951887e76019d483206c8ab3cc

diff --git a/debian/patches/openssl3.diff b/debian/patches/openssl3.diff
index e48f60b..85d61b8 100644
--- a/debian/patches/openssl3.diff
+++ b/debian/patches/openssl3.diff
@@ -5,7 +5,7 @@ Origin: upstream, commits
  https://code.qt.io/cgit/qt/qtbase.git/commit/?id=ae6590e360fbb04d
  and a small part of
  https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4c0f81490ba0c4ec
-Last-Update: 2021-12-05
+Last-Update: 2021-12-09
 
 --- a/src/network/ssl/qsslcontext_openssl.cpp
 +++ b/src/network/ssl/qsslcontext_openssl.cpp
@@ -89,21 +89,31 @@ Last-Update: 2021-12-05
      int status = 0;
 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
 +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -368,7 +368,13 @@ DEFINEFUNC(const SSL_CIPHER *, SSL_get_c
+@@ -148,7 +148,6 @@ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKE
+ DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
+ DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
+ DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
+-DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
+ DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
+ DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
+ DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
+@@ -368,7 +367,15 @@ DEFINEFUNC(const SSL_CIPHER *, SSL_get_c
  DEFINEFUNC(int, SSL_version, const SSL *a, a, return 0, return)
  DEFINEFUNC2(int, SSL_get_error, SSL *a, a, int b, b, return -1, return)
  DEFINEFUNC(STACK_OF(X509) *, SSL_get_peer_cert_chain, SSL *a, a, return nullptr, return)
 +
 +#if defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 3
 +DEFINEFUNC(X509 *, SSL_get1_peer_certificate, SSL *a, a, return nullptr, return)
++DEFINEFUNC(int, EVP_PKEY_get_base_id, const EVP_PKEY *pkey, pkey, return -1, return)
 +#else
  DEFINEFUNC(X509 *, SSL_get_peer_certificate, SSL *a, a, return nullptr, return)
++DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
 +#endif // OPENSSL_VERSION_MAJOR >= 3
 +
  DEFINEFUNC(long, SSL_get_verify_result, const SSL *a, a, return -1, return)
  DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a, return nullptr, return)
  DEFINEFUNC(SSL_CTX *, SSL_get_SSL_CTX, SSL *a, a, return nullptr, return)
-@@ -489,9 +495,7 @@ DEFINEFUNC(DH *, DH_new, DUMMYARG, DUMMY
+@@ -489,9 +496,7 @@ DEFINEFUNC(DH *, DH_new, DUMMYARG, DUMMY
  DEFINEFUNC(void, DH_free, DH *dh, dh, return, DUMMYARG)
  DEFINEFUNC3(DH *, d2i_DHparams, DH**a, a, const unsigned char **pp, pp, long length, length, return nullptr, return)
  DEFINEFUNC2(int, i2d_DHparams, DH *a, a, unsigned char **p, p, return -1, return)
@@ -113,21 +123,31 @@ Last-Update: 2021-12-05
  DEFINEFUNC3(BIGNUM *, BN_bin2bn, const unsigned char *s, s, int len, len, BIGNUM *ret, ret, return nullptr, return)
  
  #ifndef OPENSSL_NO_EC
-@@ -1073,7 +1077,13 @@ bool q_resolveOpenSslSymbols()
+@@ -848,7 +853,6 @@ bool q_resolveOpenSslSymbols()
+     RESOLVEFUNC(EVP_PKEY_CTX_new)
+     RESOLVEFUNC(EVP_PKEY_param_check)
+     RESOLVEFUNC(EVP_PKEY_CTX_free)
+-    RESOLVEFUNC(EVP_PKEY_base_id)
+     RESOLVEFUNC(RSA_bits)
+     RESOLVEFUNC(OPENSSL_sk_new_null)
+     RESOLVEFUNC(OPENSSL_sk_push)
+@@ -1073,7 +1077,15 @@ bool q_resolveOpenSslSymbols()
      RESOLVEFUNC(SSL_version)
      RESOLVEFUNC(SSL_get_error)
      RESOLVEFUNC(SSL_get_peer_cert_chain)
 +
 +#if defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 3
 +    RESOLVEFUNC(SSL_get1_peer_certificate)
++    RESOLVEFUNC(EVP_PKEY_get_base_id)
 +#else
      RESOLVEFUNC(SSL_get_peer_certificate)
++    RESOLVEFUNC(EVP_PKEY_base_id)
 +#endif // OPENSSL_VERSION_MAJOR >= 3
 +
      RESOLVEFUNC(SSL_get_verify_result)
      RESOLVEFUNC(SSL_new)
      RESOLVEFUNC(SSL_get_SSL_CTX)
-@@ -1172,9 +1182,7 @@ bool q_resolveOpenSslSymbols()
+@@ -1172,9 +1184,7 @@ bool q_resolveOpenSslSymbols()
      RESOLVEFUNC(DH_free)
      RESOLVEFUNC(d2i_DHparams)
      RESOLVEFUNC(i2d_DHparams)