You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.1 KiB
37 lines
1.1 KiB
From 1d97b931bf4701fbd3478d2b788ec4310d9eb8e1 Mon Sep 17 00:00:00 2001
|
|
From: Rosen Penev <rosenp@gmail.com>
|
|
Date: Fri, 7 Jun 2019 18:18:46 -0700
|
|
Subject: [PATCH] Add new ASN1_STRING_get0_data API
|
|
|
|
Introduced with OpenSSL 1.1
|
|
---
|
|
src/_cffi_src/openssl/asn1.py | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/src/_cffi_src/openssl/asn1.py b/src/_cffi_src/openssl/asn1.py
|
|
index da55b670..85cd58bd 100644
|
|
--- a/src/_cffi_src/openssl/asn1.py
|
|
+++ b/src/_cffi_src/openssl/asn1.py
|
|
@@ -45,6 +45,7 @@ void ASN1_OBJECT_free(ASN1_OBJECT *);
|
|
|
|
/* ASN1 STRING */
|
|
unsigned char *ASN1_STRING_data(ASN1_STRING *);
|
|
+const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *);
|
|
int ASN1_STRING_set(ASN1_STRING *, const void *, int);
|
|
|
|
/* ASN1 OCTET STRING */
|
|
@@ -105,4 +106,11 @@ ASN1_NULL *ASN1_NULL_new(void);
|
|
"""
|
|
|
|
CUSTOMIZATIONS = """
|
|
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 && !CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER
|
|
+#define ASN1_STRING_get0_data ASN1_STRING_data
|
|
+#endif
|
|
+
|
|
+#if (OPENSSL_API_COMPAT >= 0x10100000L) && !CRYPTOGRAPHY_IS_LIBRESSL
|
|
+#define ASN1_STRING_data ASN1_STRING_get0_data
|
|
+#endif
|
|
"""
|
|
--
|
|
2.26.2
|
|
|