diff options
| author | Erik Trauschke <erik.trauschke@gmail.com> | 2015-10-20 08:18:00 -0700 |
|---|---|---|
| committer | Erik Trauschke <erik.trauschke@gmail.com> | 2015-10-20 08:18:00 -0700 |
| commit | c8ab2ea92fe43d1ff64d7463c61fa9ef34cce7d8 (patch) | |
| tree | d3ed0f8b77f4f978ee847585e5b1ae1a9994270b /src/_cffi_src/build_openssl.py | |
| parent | c219b962f8f02f85edf2a3452fe4136b1211f807 (diff) | |
| parent | 018a9659924c5ffe548d716295a4292c6929c341 (diff) | |
| download | cryptography-c8ab2ea92fe43d1ff64d7463c61fa9ef34cce7d8.tar.gz cryptography-c8ab2ea92fe43d1ff64d7463c61fa9ef34cce7d8.tar.bz2 cryptography-c8ab2ea92fe43d1ff64d7463c61fa9ef34cce7d8.zip | |
Merge branch 'master' into crl_ossl_backend
Diffstat (limited to 'src/_cffi_src/build_openssl.py')
| -rw-r--r-- | src/_cffi_src/build_openssl.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/_cffi_src/build_openssl.py b/src/_cffi_src/build_openssl.py index defa69d3..c856e3d9 100644 --- a/src/_cffi_src/build_openssl.py +++ b/src/_cffi_src/build_openssl.py @@ -79,7 +79,6 @@ ffi = build_ffi_for_binding( "objects", "opensslv", "pem", - "pkcs7", "pkcs12", "rand", "rsa", @@ -87,7 +86,8 @@ ffi = build_ffi_for_binding( "x509", "x509name", "x509v3", - "x509_vfy" + "x509_vfy", + "pkcs7", ], pre_include=_OSX_PRE_INCLUDE, post_include=_OSX_POST_INCLUDE, |