summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/p8_pkey.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/asn1/p8_pkey.c')
-rw-r--r--src/lib/libcrypto/asn1/p8_pkey.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/lib/libcrypto/asn1/p8_pkey.c b/src/lib/libcrypto/asn1/p8_pkey.c
index 486aa8d42c..e7edda714b 100644
--- a/src/lib/libcrypto/asn1/p8_pkey.c
+++ b/src/lib/libcrypto/asn1/p8_pkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p8_pkey.c,v 1.14 2015/02/11 03:39:51 jsing Exp $ */ 1/* $OpenBSD: p8_pkey.c,v 1.15 2015/02/11 04:00:39 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 */
@@ -76,38 +76,26 @@ pkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
76} 76}
77 77
78static const ASN1_AUX PKCS8_PRIV_KEY_INFO_aux = { 78static const ASN1_AUX PKCS8_PRIV_KEY_INFO_aux = {
79 .app_data = NULL,
80 .flags = 0,
81 .ref_offset = 0,
82 .ref_lock = 0,
83 .asn1_cb = pkey_cb, 79 .asn1_cb = pkey_cb,
84 .enc_offset = 0,
85}; 80};
86static const ASN1_TEMPLATE PKCS8_PRIV_KEY_INFO_seq_tt[] = { 81static const ASN1_TEMPLATE PKCS8_PRIV_KEY_INFO_seq_tt[] = {
87 { 82 {
88 .flags = 0,
89 .tag = 0,
90 .offset = offsetof(PKCS8_PRIV_KEY_INFO, version), 83 .offset = offsetof(PKCS8_PRIV_KEY_INFO, version),
91 .field_name = "version", 84 .field_name = "version",
92 .item = &ASN1_INTEGER_it, 85 .item = &ASN1_INTEGER_it,
93 }, 86 },
94 { 87 {
95 .flags = 0,
96 .tag = 0,
97 .offset = offsetof(PKCS8_PRIV_KEY_INFO, pkeyalg), 88 .offset = offsetof(PKCS8_PRIV_KEY_INFO, pkeyalg),
98 .field_name = "pkeyalg", 89 .field_name = "pkeyalg",
99 .item = &X509_ALGOR_it, 90 .item = &X509_ALGOR_it,
100 }, 91 },
101 { 92 {
102 .flags = 0,
103 .tag = 0,
104 .offset = offsetof(PKCS8_PRIV_KEY_INFO, pkey), 93 .offset = offsetof(PKCS8_PRIV_KEY_INFO, pkey),
105 .field_name = "pkey", 94 .field_name = "pkey",
106 .item = &ASN1_ANY_it, 95 .item = &ASN1_ANY_it,
107 }, 96 },
108 { 97 {
109 .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SET_OF | ASN1_TFLG_OPTIONAL, 98 .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SET_OF | ASN1_TFLG_OPTIONAL,
110 .tag = 0,
111 .offset = offsetof(PKCS8_PRIV_KEY_INFO, attributes), 99 .offset = offsetof(PKCS8_PRIV_KEY_INFO, attributes),
112 .field_name = "attributes", 100 .field_name = "attributes",
113 .item = &X509_ATTRIBUTE_it, 101 .item = &X509_ATTRIBUTE_it,