aboutsummaryrefslogtreecommitdiffstats
path: root/src/_cffi_src
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-10-24 21:00:19 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-10-24 21:00:19 -0400
commitc6af93903be97612314cbd9a8d8e3264059419df (patch)
tree13c1ae21ac0def7b474406591de72b0a0c8e6927 /src/_cffi_src
parentb7ee910c2070a3e5d8d64ac17ceaa5793f114dc1 (diff)
parentd2146ec71afd482073b7b0117184a8689b408b83 (diff)
downloadcryptography-c6af93903be97612314cbd9a8d8e3264059419df.tar.gz
cryptography-c6af93903be97612314cbd9a8d8e3264059419df.tar.bz2
cryptography-c6af93903be97612314cbd9a8d8e3264059419df.zip
Merge pull request #2293 from reaperhulk/idempotent-engine-add
idempotent engine add
Diffstat (limited to 'src/_cffi_src')
-rw-r--r--src/_cffi_src/openssl/engine.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/engine.py b/src/_cffi_src/openssl/engine.py
index 011f6692..60c6f3e2 100644
--- a/src/_cffi_src/openssl/engine.py
+++ b/src/_cffi_src/openssl/engine.py
@@ -44,6 +44,8 @@ static const unsigned int ENGINE_METHOD_DIGESTS;
static const unsigned int ENGINE_METHOD_STORE;
static const unsigned int ENGINE_METHOD_ALL;
static const unsigned int ENGINE_METHOD_NONE;
+
+static const int ENGINE_R_CONFLICTING_ENGINE_ID;
"""
FUNCTIONS = """