From cadb5adca51ed3329299ef88339f6689f572dae8 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Tue, 8 Mar 2016 21:55:15 -0400 Subject: config header changes for 1.1.0 OPENSSL_config is deprecated in 1.1.0 and OPENSSL_no_config is a macro provided solely for compatibility. We don't use either of these and the only thing we actually need is an opaque typedef for CONF. --- src/_cffi_src/build_openssl.py | 1 - src/_cffi_src/openssl/conf.py | 24 ------------------------ src/_cffi_src/openssl/x509v3.py | 1 + 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 src/_cffi_src/openssl/conf.py (limited to 'src/_cffi_src') diff --git a/src/_cffi_src/build_openssl.py b/src/_cffi_src/build_openssl.py index 47fe7fd1..2ff28d75 100644 --- a/src/_cffi_src/build_openssl.py +++ b/src/_cffi_src/build_openssl.py @@ -55,7 +55,6 @@ ffi = build_ffi_for_binding( "bio", "cmac", "cms", - "conf", "crypto", "dh", "dsa", diff --git a/src/_cffi_src/openssl/conf.py b/src/_cffi_src/openssl/conf.py deleted file mode 100644 index c89ae5ca..00000000 --- a/src/_cffi_src/openssl/conf.py +++ /dev/null @@ -1,24 +0,0 @@ -# This file is dual licensed under the terms of the Apache License, Version -# 2.0, and the BSD License. See the LICENSE file in the root of this repository -# for complete details. - -from __future__ import absolute_import, division, print_function - -INCLUDES = """ -#include -""" - -TYPES = """ -typedef ... CONF; -""" - -FUNCTIONS = """ -void OPENSSL_config(const char *); -void OPENSSL_no_config(void); -""" - -MACROS = """ -""" - -CUSTOMIZATIONS = """ -""" diff --git a/src/_cffi_src/openssl/x509v3.py b/src/_cffi_src/openssl/x509v3.py index 3612f1c2..d4a93f26 100644 --- a/src/_cffi_src/openssl/x509v3.py +++ b/src/_cffi_src/openssl/x509v3.py @@ -34,6 +34,7 @@ typedef ... Cryptography_STACK_OF_POLICYINFO; typedef ... Cryptography_STACK_OF_ASN1_INTEGER; typedef ... Cryptography_STACK_OF_GENERAL_SUBTREE; typedef ... EXTENDED_KEY_USAGE; +typedef ... CONF; typedef struct { X509 *issuer_cert; -- cgit v1.2.3