commit a83d2183ab42fa190d9c9d35a694edd9ded5943f
author Alex Gaynor <alex.gaynor@gmail.com> Thu Mar 13 07:51:45 2014 -0700
committer Alex Gaynor <alex.gaynor@gmail.com> Thu Mar 13 07:51:45 2014 -0700
tree ec2e69b6fa9e87c6abaa1bf4f07cc41e3e50d94f
parent b3231a171b4a44e8d09a5410afd017a2a81d5f45
parent 6274991b2680553fe272da6734e1da026987c1a8

Merge pull request #790 from reaperhulk/098b-sigh

0.9.8b support

cryptography/hazmat/bindings/openssl/err.py

diff --git a/cryptography/hazmat/bindings/openssl/err.py b/cryptography/hazmat/bindings/openssl/err.py
index 1c8bdd1..616eeac 100644
--- a/cryptography/hazmat/bindings/openssl/err.py
+++ b/cryptography/hazmat/bindings/openssl/err.py
@@ -20,6 +20,7 @@
 TYPES = """
 static const int Cryptography_HAS_REMOVE_THREAD_STATE;
 static const int Cryptography_HAS_098H_ERROR_CODES;
+static const int Cryptography_HAS_098C_ERROR_CODES;
 
 struct ERR_string_data_st {
     unsigned long error;
@@ -100,7 +101,6 @@
 static const int ASN1_R_WRONG_TYPE;
 
 static const int EVP_F_AES_INIT_KEY;
-static const int EVP_F_CAMELLIA_INIT_KEY;
 static const int EVP_F_D2I_PKEY;
 static const int EVP_F_DSA_PKEY2PKCS8;
 static const int EVP_F_DSAPKEY2PKCS8;
@@ -141,7 +141,6 @@
 static const int EVP_R_BAD_KEY_LENGTH;
 static const int EVP_R_BN_DECODE_ERROR;
 static const int EVP_R_BN_PUBKEY_ERROR;
-static const int EVP_R_CAMELLIA_KEY_SETUP_FAILED;
 static const int EVP_R_CIPHER_PARAMETER_ERROR;
 static const int EVP_R_CTRL_NOT_IMPLEMENTED;
 static const int EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED;
@@ -266,6 +265,8 @@
 static const int ASN1_R_NO_CONTENT_TYPE;
 static const int ASN1_R_NO_MULTIPART_BODY_FAILURE;
 static const int ASN1_R_NO_MULTIPART_BOUNDARY;
+static const int EVP_F_CAMELLIA_INIT_KEY;
+static const int EVP_R_CAMELLIA_KEY_SETUP_FAILED;
 """
 
 CUSTOMIZATIONS = """
@@ -290,6 +291,16 @@
 static const int ASN1_R_NO_MULTIPART_BODY_FAILURE = 0;
 static const int ASN1_R_NO_MULTIPART_BOUNDARY = 0;
 #endif
+
+// OpenSSL 0.9.8c+
+#if OPENSSL_VERSION_NUMBER >= 0x0090803fL
+static const long Cryptography_HAS_098C_ERROR_CODES = 1;
+#else
+static const long Cryptography_HAS_098C_ERROR_CODES = 0;
+static const int EVP_F_CAMELLIA_INIT_KEY = 0;
+static const int EVP_R_CAMELLIA_KEY_SETUP_FAILED = 0;
+#endif
+
 """
 
 CONDITIONAL_NAMES = {
@@ -305,4 +316,8 @@
         "ASN1_R_NO_MULTIPART_BODY_FAILURE",
         "ASN1_R_NO_MULTIPART_BOUNDARY",
     ],
+    "Cryptography_HAS_098C_ERROR_CODES": [
+        "EVP_F_CAMELLIA_INIT_KEY",
+        "EVP_R_CAMELLIA_KEY_SETUP_FAILED"
+    ]
 }