diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/p5_pbe.c')
-rw-r--r-- | src/lib/libcrypto/asn1/p5_pbe.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/libcrypto/asn1/p5_pbe.c b/src/lib/libcrypto/asn1/p5_pbe.c index 6d08cb28a1..3e7057bb24 100644 --- a/src/lib/libcrypto/asn1/p5_pbe.c +++ b/src/lib/libcrypto/asn1/p5_pbe.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p5_pbe.c,v 1.19 2015/02/11 03:39:51 jsing Exp $ */ | 1 | /* $OpenBSD: p5_pbe.c,v 1.20 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 | */ |
@@ -68,15 +68,11 @@ | |||
68 | 68 | ||
69 | static const ASN1_TEMPLATE PBEPARAM_seq_tt[] = { | 69 | static const ASN1_TEMPLATE PBEPARAM_seq_tt[] = { |
70 | { | 70 | { |
71 | .flags = 0, | ||
72 | .tag = 0, | ||
73 | .offset = offsetof(PBEPARAM, salt), | 71 | .offset = offsetof(PBEPARAM, salt), |
74 | .field_name = "salt", | 72 | .field_name = "salt", |
75 | .item = &ASN1_OCTET_STRING_it, | 73 | .item = &ASN1_OCTET_STRING_it, |
76 | }, | 74 | }, |
77 | { | 75 | { |
78 | .flags = 0, | ||
79 | .tag = 0, | ||
80 | .offset = offsetof(PBEPARAM, iter), | 76 | .offset = offsetof(PBEPARAM, iter), |
81 | .field_name = "iter", | 77 | .field_name = "iter", |
82 | .item = &ASN1_INTEGER_it, | 78 | .item = &ASN1_INTEGER_it, |
@@ -88,7 +84,6 @@ const ASN1_ITEM PBEPARAM_it = { | |||
88 | .utype = V_ASN1_SEQUENCE, | 84 | .utype = V_ASN1_SEQUENCE, |
89 | .templates = PBEPARAM_seq_tt, | 85 | .templates = PBEPARAM_seq_tt, |
90 | .tcount = sizeof(PBEPARAM_seq_tt) / sizeof(ASN1_TEMPLATE), | 86 | .tcount = sizeof(PBEPARAM_seq_tt) / sizeof(ASN1_TEMPLATE), |
91 | .funcs = NULL, | ||
92 | .size = sizeof(PBEPARAM), | 87 | .size = sizeof(PBEPARAM), |
93 | .sname = "PBEPARAM", | 88 | .sname = "PBEPARAM", |
94 | }; | 89 | }; |