aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-10-19 17:34:13 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-10-19 17:34:13 -0700
commit641ad5838a5613a3b7c287cb3444550a2fc01dc3 (patch)
tree7d9d85147c11fdc00697ec07723844dc40515aaa
parent1f8a60452fb5f2e758b895157685a07dea5b3462 (diff)
parent13d64e093894aca90062feac6db264e17e654e4d (diff)
downloadcryptography-641ad5838a5613a3b7c287cb3444550a2fc01dc3.tar.gz
cryptography-641ad5838a5613a3b7c287cb3444550a2fc01dc3.tar.bz2
cryptography-641ad5838a5613a3b7c287cb3444550a2fc01dc3.zip
Merge pull request #1414 from reaperhulk/new-nids
start adding NIDs we'll need for X509
-rw-r--r--cryptography/hazmat/bindings/openssl/nid.py33
1 files changed, 29 insertions, 4 deletions
diff --git a/cryptography/hazmat/bindings/openssl/nid.py b/cryptography/hazmat/bindings/openssl/nid.py
index 133d2ca4..b2e61492 100644
--- a/cryptography/hazmat/bindings/openssl/nid.py
+++ b/cryptography/hazmat/bindings/openssl/nid.py
@@ -13,7 +13,9 @@
from __future__ import absolute_import, division, print_function
-INCLUDES = ""
+INCLUDES = """
+#include <openssl/obj_mac.h>
+"""
TYPES = """
static const int Cryptography_HAS_ECDSA_SHA2_NIDS;
@@ -39,10 +41,7 @@ static const int NID_ecdsa_with_SHA224;
static const int NID_ecdsa_with_SHA256;
static const int NID_ecdsa_with_SHA384;
static const int NID_ecdsa_with_SHA512;
-static const int NID_crl_reason;
static const int NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
-static const int NID_subject_alt_name;
-static const int NID_issuer_alt_name;
static const int NID_X9_62_c2pnb163v1;
static const int NID_X9_62_c2pnb163v2;
static const int NID_X9_62_c2pnb163v3;
@@ -185,6 +184,32 @@ static const char *const SN_wap_wsg_idm_ecid_wtls11;
static const char *const SN_wap_wsg_idm_ecid_wtls12;
static const char *const SN_ipsec3;
static const char *const SN_ipsec4;
+
+static const int NID_subject_key_identifier;
+static const int NID_authority_key_identifier;
+static const int NID_policy_constraints;
+static const int NID_ext_key_usage;
+static const int NID_info_access;
+static const int NID_key_usage;
+static const int NID_subject_alt_name;
+static const int NID_issuer_alt_name;
+static const int NID_basic_constraints;
+static const int NID_issuing_distribution_point;
+static const int NID_certificate_issuer;
+static const int NID_name_constraints;
+static const int NID_crl_distribution_points;
+static const int NID_certificate_policies;
+static const int NID_inhibit_any_policy;
+
+static const int NID_private_key_usage_period;
+static const int NID_crl_number;
+static const int NID_crl_reason;
+static const int NID_invalidity_date;
+static const int NID_delta_crl;
+static const int NID_any_policy;
+static const int NID_policy_mappings;
+static const int NID_target_information;
+static const int NID_no_rev_avail;
"""
FUNCTIONS = """