summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-03-05 03:50:25 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-03-05 03:50:25 (GMT)
commitde8eca46385842a2d5c75ee5a9a8c596735f9c68 (patch)
treeb22236bed104ef1b6c4d4e4604d533fb3bb64bb6 /Modules
parentb64ae7bf2dcc010e6f0414d365e1ee4caba58ef0 (diff)
parent990fcaac3c428569697f62a80fd95ab4d4b93151 (diff)
downloadcpython-de8eca46385842a2d5c75ee5a9a8c596735f9c68.zip
cpython-de8eca46385842a2d5c75ee5a9a8c596735f9c68.tar.gz
cpython-de8eca46385842a2d5c75ee5a9a8c596735f9c68.tar.bz2
merge 3.4
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_ssl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index af68b94..8596225 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -4458,6 +4458,10 @@ PyInit__ssl(void)
X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL);
PyModule_AddIntConstant(m, "VERIFY_X509_STRICT",
X509_V_FLAG_X509_STRICT);
+#ifdef X509_V_FLAG_TRUSTED_FIRST
+ PyModule_AddIntConstant(m, "VERIFY_X509_TRUSTED_FIRST",
+ X509_V_FLAG_TRUSTED_FIRST);
+#endif
/* Alert Descriptions from ssl.h */
/* note RESERVED constants no longer intended for use have been removed */