git.openwrt.org Git - feed/packages.git/blob

   1 From 07fb50eecc3a3a50ac543f53f98c285eb1ceeb1e Mon Sep 17 00:00:00 2001
   2 From: Rosen Penev <rosenp@gmail.com>
   3 Date: Mon, 25 Nov 2019 12:06:16 -0800
   4 Subject: [PATCH] Add X509_STORE_CTX_trusted_stack compatibility macro
   5
   6 Deprecated in 1.1
   7
   8 Signed-off-by: Rosen Penev <rosenp@gmail.com>
   9 ---
  10  src/_cffi_src/openssl/x509_vfy.py | 17 ++++++++++++++++-
  11  1 file changed, 16 insertions(+), 1 deletion(-)
  12
  13 --- a/src/_cffi_src/openssl/x509_vfy.py
  14 +++ b/src/_cffi_src/openssl/x509_vfy.py
  15 @@ -157,8 +157,12 @@ int X509_STORE_CTX_init(X509_STORE_CTX *
  16                          Cryptography_STACK_OF_X509 *);
  17  void X509_STORE_CTX_trusted_stack(X509_STORE_CTX *,
  18                                    Cryptography_STACK_OF_X509 *);
  19 +void X509_STORE_CTX_set0_trusted_stack(X509_STORE_CTX *,
  20 +                                  Cryptography_STACK_OF_X509 *);
  21  void X509_STORE_CTX_set_cert(X509_STORE_CTX *, X509 *);
  22 -void X509_STORE_CTX_set_chain(X509_STORE_CTX *,Cryptography_STACK_OF_X509 *);
  23 +void X509_STORE_CTX_set_chain(X509_STORE_CTX *, Cryptography_STACK_OF_X509 *);
  24 +void X509_STORE_CTX_set0_untrusted(X509_STORE_CTX *,
  25 +                                  Cryptography_STACK_OF_X509 *);
  26  X509_VERIFY_PARAM *X509_STORE_CTX_get0_param(X509_STORE_CTX *);
  27  void X509_STORE_CTX_set0_param(X509_STORE_CTX *, X509_VERIFY_PARAM *);
  28  int X509_STORE_CTX_set_default(X509_STORE_CTX *, const char *);
  29 @@ -282,4 +286,15 @@ static const long Cryptography_HAS_X509_
  30  #else
  31  static const long Cryptography_HAS_X509_CB_ISSUER_CHECK = 1;
  32  #endif
  33 +
  34 +#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 && !CRYPTOGRAPHY_IS_LIBRESSL
  35 +#define X509_STORE_CTX_set0_trusted_stack X509_STORE_CTX_trusted_stack
  36 +#define X509_STORE_CTX_set0_untrusted X509_STORE_CTX_set_chain
  37 +#endif
  38 +
  39 +#if (OPENSSL_API_COMPAT >= 0x10100000L) && !CRYPTOGRAPHY_IS_LIBRESSL
  40 +#define X509_STORE_CTX_trusted_stack X509_STORE_CTX_set0_trusted_stack
  41 +#define X509_STORE_CTX_set_chain X509_STORE_CTX_set0_untrusted
  42 +#define X509_STORE_CTX_get_chain X509_STORE_CTX_get1_chain
  43 +#endif
  44  """