commit ae234b70307ca0a1c1eece5efd9714518d611bc3
author Laurens Van Houtven <_@lvh.cc> Fri Jun 20 14:32:04 2014 +0200
committer Laurens Van Houtven <_@lvh.cc> Fri Jun 20 14:32:04 2014 +0200
tree 912c569d3a9dee49160487d982e0f31596468a1c
parent bf6feb7bbb42caf097f0e145e57cd102045b2877

Move X509_STORE functions to x509_vfy.py

cryptography/hazmat/bindings/openssl/x509.py

diff --git a/cryptography/hazmat/bindings/openssl/x509.py b/cryptography/hazmat/bindings/openssl/x509.py
index c0be306..3785cc6 100644
--- a/cryptography/hazmat/bindings/openssl/x509.py
+++ b/cryptography/hazmat/bindings/openssl/x509.py
@@ -76,7 +76,6 @@
     ...;
 } X509;
 
-typedef ... X509_STORE;
 typedef ... NETSCAPE_SPKI;
 """
 
@@ -166,12 +165,6 @@
 ASN1_INTEGER *X509_get_serialNumber(X509 *);
 int X509_set_serialNumber(X509 *, ASN1_INTEGER *);
 
-/*  X509_STORE */
-X509_STORE *X509_STORE_new(void);
-void X509_STORE_free(X509_STORE *);
-int X509_STORE_add_cert(X509_STORE *, X509 *);
-int X509_verify_cert(X509_STORE_CTX *);
-
 const char *X509_verify_cert_error_string(long);
 
 const char *X509_get_default_cert_area(void);

cryptography/hazmat/bindings/openssl/x509_vfy.py

diff --git a/cryptography/hazmat/bindings/openssl/x509_vfy.py b/cryptography/hazmat/bindings/openssl/x509_vfy.py
index 028f892..338e81e 100644
--- a/cryptography/hazmat/bindings/openssl/x509_vfy.py
+++ b/cryptography/hazmat/bindings/openssl/x509_vfy.py
@@ -36,6 +36,8 @@
 static const long Cryptography_HAS_X509_V_FLAG_CHECK_SS_SIGNATURE;
 
 typedef ... Cryptography_STACK_OF_ASN1_OBJECT;
+
+typedef ... X509_STORE;
 typedef ... X509_STORE_CTX;
 typedef ... X509_VERIFY_PARAM;
 
@@ -132,6 +134,13 @@
 """
 
 FUNCTIONS = """
+int X509_verify_cert(X509_STORE_CTX *);
+
+/* X509_STORE */
+X509_STORE *X509_STORE_new(void);
+void X509_STORE_free(X509_STORE *);
+int X509_STORE_add_cert(X509_STORE *, X509 *);
+
 /*  X509_STORE_CTX */
 int X509_STORE_CTX_get_error(X509_STORE_CTX *);
 void X509_STORE_CTX_set_error(X509_STORE_CTX *, int);