diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-09 07:49:38 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-09 07:49:38 -0500 |
| commit | 18e5120fc44efff743b1b673b46b8173257c2aab (patch) | |
| tree | 486daddb91aab50ddd697e748f950ef76add37aa | |
| parent | 9e753d4bfd187568c99dce5de6c2bc034aae717e (diff) | |
| parent | cadb5adca51ed3329299ef88339f6689f572dae8 (diff) | |
| download | cryptography-18e5120fc44efff743b1b673b46b8173257c2aab.tar.gz cryptography-18e5120fc44efff743b1b673b46b8173257c2aab.tar.bz2 cryptography-18e5120fc44efff743b1b673b46b8173257c2aab.zip | |
Merge pull request #2781 from reaperhulk/110-patch-5
config header changes for 1.1.0
| -rw-r--r-- | src/_cffi_src/build_openssl.py | 1 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/conf.py | 24 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/x509v3.py | 1 |
3 files changed, 1 insertions, 25 deletions
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 <openssl/conf.h> -""" - -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; |