aboutsummaryrefslogtreecommitdiffstats
path: root/src/cryptography/hazmat/bindings/openssl/_conditional.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-11-12 20:41:45 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2015-11-12 20:41:45 -0500
commit0da7432bbbb4ad0a603529281f75672f475b06b2 (patch)
tree8200124a62994943281fce23506a0f9832a5cb54 /src/cryptography/hazmat/bindings/openssl/_conditional.py
parent747ef464bf87a70a12ce2236c5408a7a0440cc44 (diff)
parent2176fb8fbceda6538d51900fbf6d349f48b9ea8b (diff)
downloadcryptography-0da7432bbbb4ad0a603529281f75672f475b06b2.tar.gz
cryptography-0da7432bbbb4ad0a603529281f75672f475b06b2.tar.bz2
cryptography-0da7432bbbb4ad0a603529281f75672f475b06b2.zip
Merge pull request #2475 from reaperhulk/cms-098hplus
these functions were added in 1.0.0, while CMS was added in 0.9.8h
Diffstat (limited to 'src/cryptography/hazmat/bindings/openssl/_conditional.py')
-rw-r--r--src/cryptography/hazmat/bindings/openssl/_conditional.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py
index 670710b1..f0ad1d5e 100644
--- a/src/cryptography/hazmat/bindings/openssl/_conditional.py
+++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py
@@ -52,6 +52,11 @@ CONDITIONAL_NAMES = {
"CMS_USE_KEYID",
"CMS_DEBUG_DECRYPT",
],
+ "Cryptography_HAS_CMS_BIO_FUNCTIONS": [
+ "BIO_new_CMS",
+ "i2d_CMS_bio_stream",
+ "PEM_write_bio_CMS_stream",
+ ],
"Cryptography_HAS_EC": [
"OPENSSL_EC_NAMED_CURVE",
"EC_GROUP_new",