Remove initialisers with default values from the ASN1 data structures.

Minor changes in generated assembly due to the compiler swapping from
.quad 0/.long 0 to .zero, along with changes due to line numbering.

1 files changed, 1 insertions, 13 deletions

diff --git a/src/lib/libcrypto/asn1/p5_pbev2.c b/src/lib/libcrypto/asn1/p5_pbev2.c
index f967f25d3d..795721fad2 100644
--- a/src/lib/libcrypto/asn1/p5_pbev2.c
+++ b/src/lib/libcrypto/asn1/p5_pbev2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p5_pbev2.c,v 1.20 2015/02/11 03:39:51 jsing Exp $ */
+/* $OpenBSD: p5_pbev2.c,v 1.21 2015/02/11 04:00:39 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999-2004.
  */
@@ -68,15 +68,11 @@
 
 static const ASN1_TEMPLATE PBE2PARAM_seq_tt[] = {
         {
-                .flags = 0,
-                .tag = 0,
                 .offset = offsetof(PBE2PARAM, keyfunc),
                 .field_name = "keyfunc",
                 .item = &X509_ALGOR_it,
         },
         {
-                .flags = 0,
-                .tag = 0,
                 .offset = offsetof(PBE2PARAM, encryption),
                 .field_name = "encryption",
                 .item = &X509_ALGOR_it,
@@ -88,7 +84,6 @@ const ASN1_ITEM PBE2PARAM_it = {
         .utype = V_ASN1_SEQUENCE,
         .templates = PBE2PARAM_seq_tt,
         .tcount = sizeof(PBE2PARAM_seq_tt) / sizeof(ASN1_TEMPLATE),
-        .funcs = NULL,
         .size = sizeof(PBE2PARAM),
         .sname = "PBE2PARAM",
 };
@@ -121,29 +116,23 @@ PBE2PARAM_free(PBE2PARAM *a)
 
 static const ASN1_TEMPLATE PBKDF2PARAM_seq_tt[] = {
         {
-                .flags = 0,
-                .tag = 0,
                 .offset = offsetof(PBKDF2PARAM, salt),
                 .field_name = "salt",
                 .item = &ASN1_ANY_it,
         },
         {
-                .flags = 0,
-                .tag = 0,
                 .offset = offsetof(PBKDF2PARAM, iter),
                 .field_name = "iter",
                 .item = &ASN1_INTEGER_it,
         },
         {
                 .flags = ASN1_TFLG_OPTIONAL,
-                .tag = 0,
                 .offset = offsetof(PBKDF2PARAM, keylength),
                 .field_name = "keylength",
                 .item = &ASN1_INTEGER_it,
         },
         {
                 .flags = ASN1_TFLG_OPTIONAL,
-                .tag = 0,
                 .offset = offsetof(PBKDF2PARAM, prf),
                 .field_name = "prf",
                 .item = &X509_ALGOR_it,
@@ -155,7 +144,6 @@ const ASN1_ITEM PBKDF2PARAM_it = {
         .utype = V_ASN1_SEQUENCE,
         .templates = PBKDF2PARAM_seq_tt,
         .tcount = sizeof(PBKDF2PARAM_seq_tt) / sizeof(ASN1_TEMPLATE),
-        .funcs = NULL,
         .size = sizeof(PBKDF2PARAM),
         .sname = "PBKDF2PARAM",
 };