diff options
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_int.c')
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_int.c | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_int.c b/src/lib/libcrypto/x509v3/v3_int.c index 4bfd14cf46..51f9e5cdc6 100644 --- a/src/lib/libcrypto/x509v3/v3_int.c +++ b/src/lib/libcrypto/x509v3/v3_int.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * are met: | 10 | * are met: |
11 | * | 11 | * |
12 | * 1. Redistributions of source code must retain the above copyright | 12 | * 1. Redistributions of source code must retain the above copyright |
13 | * notice, this list of conditions and the following disclaimer. | 13 | * notice, this list of conditions and the following disclaimer. |
14 | * | 14 | * |
15 | * 2. Redistributions in binary form must reproduce the above copyright | 15 | * 2. Redistributions in binary form must reproduce the above copyright |
16 | * notice, this list of conditions and the following disclaimer in | 16 | * notice, this list of conditions and the following disclaimer in |
@@ -60,30 +60,35 @@ | |||
60 | #include "cryptlib.h" | 60 | #include "cryptlib.h" |
61 | #include <openssl/x509v3.h> | 61 | #include <openssl/x509v3.h> |
62 | 62 | ||
63 | const X509V3_EXT_METHOD v3_crl_num = { | 63 | const X509V3_EXT_METHOD v3_crl_num = { |
64 | NID_crl_number, 0, ASN1_ITEM_ref(ASN1_INTEGER), | 64 | NID_crl_number, 0, ASN1_ITEM_ref(ASN1_INTEGER), |
65 | 0,0,0,0, | 65 | 0, 0, 0, 0, |
66 | (X509V3_EXT_I2S)i2s_ASN1_INTEGER, | 66 | (X509V3_EXT_I2S)i2s_ASN1_INTEGER, |
67 | 0, | 67 | 0, |
68 | 0,0,0,0, NULL}; | 68 | 0, 0, 0, 0, |
69 | NULL | ||
70 | }; | ||
69 | 71 | ||
70 | const X509V3_EXT_METHOD v3_delta_crl = { | 72 | const X509V3_EXT_METHOD v3_delta_crl = { |
71 | NID_delta_crl, 0, ASN1_ITEM_ref(ASN1_INTEGER), | 73 | NID_delta_crl, 0, ASN1_ITEM_ref(ASN1_INTEGER), |
72 | 0,0,0,0, | 74 | 0, 0, 0, 0, |
73 | (X509V3_EXT_I2S)i2s_ASN1_INTEGER, | 75 | (X509V3_EXT_I2S)i2s_ASN1_INTEGER, |
74 | 0, | 76 | 0, |
75 | 0,0,0,0, NULL}; | 77 | 0, 0, 0, 0, |
78 | NULL | ||
79 | }; | ||
76 | 80 | ||
77 | static void * s2i_asn1_int(X509V3_EXT_METHOD *meth, X509V3_CTX *ctx, char *value) | 81 | static void * |
78 | { | 82 | s2i_asn1_int(X509V3_EXT_METHOD *meth, X509V3_CTX *ctx, char *value) |
83 | { | ||
79 | return s2i_ASN1_INTEGER(meth, value); | 84 | return s2i_ASN1_INTEGER(meth, value); |
80 | } | 85 | } |
81 | 86 | ||
82 | const X509V3_EXT_METHOD v3_inhibit_anyp = { | 87 | const X509V3_EXT_METHOD v3_inhibit_anyp = { |
83 | NID_inhibit_any_policy, 0, ASN1_ITEM_ref(ASN1_INTEGER), | 88 | NID_inhibit_any_policy, 0, ASN1_ITEM_ref(ASN1_INTEGER), |
84 | 0,0,0,0, | 89 | 0, 0, 0, 0, |
85 | (X509V3_EXT_I2S)i2s_ASN1_INTEGER, | 90 | (X509V3_EXT_I2S)i2s_ASN1_INTEGER, |
86 | (X509V3_EXT_S2I)s2i_asn1_int, | 91 | (X509V3_EXT_S2I)s2i_asn1_int, |
87 | 0,0,0,0, NULL}; | 92 | 0, 0, 0, 0, |
88 | 93 | NULL | |
89 | 94 | }; | |