aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Paul Calderone <exarkun@twistedmatrix.com>2013-12-28 12:57:42 -0500
committerJean-Paul Calderone <exarkun@twistedmatrix.com>2013-12-28 12:57:42 -0500
commitf5360499bac470d2d3231f2529bce5bc0a770c76 (patch)
tree61a7996ac2ce81d2623b28f947d115eba49cdd19
parent23828690cf20fbf6590c7b19d7eb1b13baef92a2 (diff)
downloadcryptography-f5360499bac470d2d3231f2529bce5bc0a770c76.tar.gz
cryptography-f5360499bac470d2d3231f2529bce5bc0a770c76.tar.bz2
cryptography-f5360499bac470d2d3231f2529bce5bc0a770c76.zip
Put back these other functions now that they ought to work.
-rw-r--r--cryptography/hazmat/backends/openssl/ssl.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/cryptography/hazmat/backends/openssl/ssl.py b/cryptography/hazmat/backends/openssl/ssl.py
index c3d485b2..e62a45a5 100644
--- a/cryptography/hazmat/backends/openssl/ssl.py
+++ b/cryptography/hazmat/backends/openssl/ssl.py
@@ -18,6 +18,7 @@ INCLUDES = """
* Get some simpler definitions for some types used by later prototypes.
*/
typedef STACK_OF(X509) Cryptography_STACK_OF_X509;
+typedef STACK_OF(X509_NAME) Cryptography_STACK_OF_X509_NAME;
"""
TYPES = """
@@ -171,7 +172,7 @@ X509 *SSL_get_peer_certificate(const SSL *);
*/
Cryptography_STACK_OF_X509 *SSL_get_peer_cert_chain(const SSL *);
-// Cryptography_STACK_OF_X509_NAME *SSL_get_client_CA_list(const SSL *);
+Cryptography_STACK_OF_X509_NAME *SSL_get_client_CA_list(const SSL *);
int SSL_get_error(const SSL *, int);
int SSL_do_handshake(SSL *);
@@ -203,9 +204,9 @@ X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *);
int SSL_CTX_add_client_CA(SSL_CTX *, X509 *);
/*
- * See comment above about STACK_OF(...) vs stack_st_...
+ * See comment above about STACK_OF(...)
*/
-// void SSL_CTX_set_client_CA_list(SSL_CTX *, Cryptography_STACK_OF_X509_NAME *);
+void SSL_CTX_set_client_CA_list(SSL_CTX *, Cryptography_STACK_OF_X509_NAME *);
/* X509_STORE_CTX */