summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/n_pkey.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/asn1/n_pkey.c')
-rw-r--r--src/lib/libcrypto/asn1/n_pkey.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/src/lib/libcrypto/asn1/n_pkey.c b/src/lib/libcrypto/asn1/n_pkey.c
index 8f65a4b926..bb369fde6e 100644
--- a/src/lib/libcrypto/asn1/n_pkey.c
+++ b/src/lib/libcrypto/asn1/n_pkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: n_pkey.c,v 1.24 2015/02/11 03:39:51 jsing Exp $ */ 1/* $OpenBSD: n_pkey.c,v 1.25 2015/02/11 04:00:39 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -88,24 +88,15 @@ typedef struct netscape_encrypted_pkey_st {
88 88
89 89
90static const ASN1_AUX NETSCAPE_ENCRYPTED_PKEY_aux = { 90static const ASN1_AUX NETSCAPE_ENCRYPTED_PKEY_aux = {
91 .app_data = NULL,
92 .flags = ASN1_AFLG_BROKEN, 91 .flags = ASN1_AFLG_BROKEN,
93 .ref_offset = 0,
94 .ref_lock = 0,
95 .asn1_cb = NULL,
96 .enc_offset = 0,
97}; 92};
98static const ASN1_TEMPLATE NETSCAPE_ENCRYPTED_PKEY_seq_tt[] = { 93static const ASN1_TEMPLATE NETSCAPE_ENCRYPTED_PKEY_seq_tt[] = {
99 { 94 {
100 .flags = 0,
101 .tag = 0,
102 .offset = offsetof(NETSCAPE_ENCRYPTED_PKEY, os), 95 .offset = offsetof(NETSCAPE_ENCRYPTED_PKEY, os),
103 .field_name = "os", 96 .field_name = "os",
104 .item = &ASN1_OCTET_STRING_it, 97 .item = &ASN1_OCTET_STRING_it,
105 }, 98 },
106 { 99 {
107 .flags = 0,
108 .tag = 0,
109 .offset = offsetof(NETSCAPE_ENCRYPTED_PKEY, enckey), 100 .offset = offsetof(NETSCAPE_ENCRYPTED_PKEY, enckey),
110 .field_name = "enckey", 101 .field_name = "enckey",
111 .item = &X509_SIG_it, 102 .item = &X509_SIG_it,
@@ -152,22 +143,16 @@ NETSCAPE_ENCRYPTED_PKEY_free(NETSCAPE_ENCRYPTED_PKEY *a)
152 143
153static const ASN1_TEMPLATE NETSCAPE_PKEY_seq_tt[] = { 144static const ASN1_TEMPLATE NETSCAPE_PKEY_seq_tt[] = {
154 { 145 {
155 .flags = 0,
156 .tag = 0,
157 .offset = offsetof(NETSCAPE_PKEY, version), 146 .offset = offsetof(NETSCAPE_PKEY, version),
158 .field_name = "version", 147 .field_name = "version",
159 .item = &LONG_it, 148 .item = &LONG_it,
160 }, 149 },
161 { 150 {
162 .flags = 0,
163 .tag = 0,
164 .offset = offsetof(NETSCAPE_PKEY, algor), 151 .offset = offsetof(NETSCAPE_PKEY, algor),
165 .field_name = "algor", 152 .field_name = "algor",
166 .item = &X509_ALGOR_it, 153 .item = &X509_ALGOR_it,
167 }, 154 },
168 { 155 {
169 .flags = 0,
170 .tag = 0,
171 .offset = offsetof(NETSCAPE_PKEY, private_key), 156 .offset = offsetof(NETSCAPE_PKEY, private_key),
172 .field_name = "private_key", 157 .field_name = "private_key",
173 .item = &ASN1_OCTET_STRING_it, 158 .item = &ASN1_OCTET_STRING_it,
@@ -179,7 +164,6 @@ const ASN1_ITEM NETSCAPE_PKEY_it = {
179 .utype = V_ASN1_SEQUENCE, 164 .utype = V_ASN1_SEQUENCE,
180 .templates = NETSCAPE_PKEY_seq_tt, 165 .templates = NETSCAPE_PKEY_seq_tt,
181 .tcount = sizeof(NETSCAPE_PKEY_seq_tt) / sizeof(ASN1_TEMPLATE), 166 .tcount = sizeof(NETSCAPE_PKEY_seq_tt) / sizeof(ASN1_TEMPLATE),
182 .funcs = NULL,
183 .size = sizeof(NETSCAPE_PKEY), 167 .size = sizeof(NETSCAPE_PKEY),
184 .sname = "NETSCAPE_PKEY", 168 .sname = "NETSCAPE_PKEY",
185}; 169};