diff options
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_skey.c')
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_skey.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_skey.c b/src/lib/libcrypto/x509v3/v3_skey.c index 1bcf8dacfb..252fec3b08 100644 --- a/src/lib/libcrypto/x509v3/v3_skey.c +++ b/src/lib/libcrypto/x509v3/v3_skey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_skey.c,v 1.11 2015/07/29 14:58:34 jsing Exp $ */ | 1 | /* $OpenBSD: v3_skey.c,v 1.12 2015/07/29 16:13:49 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -64,13 +64,22 @@ | |||
64 | 64 | ||
65 | static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, | 65 | static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, |
66 | X509V3_CTX *ctx, char *str); | 66 | X509V3_CTX *ctx, char *str); |
67 | |||
67 | const X509V3_EXT_METHOD v3_skey_id = { | 68 | const X509V3_EXT_METHOD v3_skey_id = { |
68 | NID_subject_key_identifier, 0, ASN1_ITEM_ref(ASN1_OCTET_STRING), | 69 | .ext_nid = NID_subject_key_identifier, |
69 | 0, 0, 0, 0, | 70 | .ext_flags = 0, |
70 | (X509V3_EXT_I2S)i2s_ASN1_OCTET_STRING, | 71 | .it = ASN1_ITEM_ref(ASN1_OCTET_STRING), |
71 | (X509V3_EXT_S2I)s2i_skey_id, | 72 | .ext_new = NULL, |
72 | 0, 0, 0, 0, | 73 | .ext_free = NULL, |
73 | NULL | 74 | .d2i = NULL, |
75 | .i2d = NULL, | ||
76 | .i2s = (X509V3_EXT_I2S)i2s_ASN1_OCTET_STRING, | ||
77 | .s2i = (X509V3_EXT_S2I)s2i_skey_id, | ||
78 | .i2v = NULL, | ||
79 | .v2i = NULL, | ||
80 | .i2r = NULL, | ||
81 | .r2i = NULL, | ||
82 | .usr_data = NULL, | ||
74 | }; | 83 | }; |
75 | 84 | ||
76 | char * | 85 | char * |