From 855cfdd02f6edced6ce938b8f90e92871cef8bb8 Mon Sep 17 00:00:00 2001
From: Joel Sing <jsing@cvs.openbsd.org>
Date: Wed, 11 Feb 2015 04:00:40 +0000
Subject: 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.
---
 lib/libcrypto/asn1/x_req.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'lib/libcrypto/asn1/x_req.c')

diff --git a/lib/libcrypto/asn1/x_req.c b/lib/libcrypto/asn1/x_req.c
index 5e8aa21b0d1..5ffa11e2ddf 100644
--- a/lib/libcrypto/asn1/x_req.c
+++ b/lib/libcrypto/asn1/x_req.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_req.c,v 1.14 2015/02/11 03:39:51 jsing Exp $ */
+/* $OpenBSD: x_req.c,v 1.15 2015/02/11 04:00:39 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -93,31 +93,22 @@ rinf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
 }
 
 static const ASN1_AUX X509_REQ_INFO_aux = {
-	.app_data = NULL,
 	.flags = ASN1_AFLG_ENCODING,
-	.ref_offset = 0,
-	.ref_lock = 0,
 	.asn1_cb = rinf_cb,
 	.enc_offset = offsetof(X509_REQ_INFO, enc),
 };
 static const ASN1_TEMPLATE X509_REQ_INFO_seq_tt[] = {
 	{
-		.flags = 0,
-		.tag = 0,
 		.offset = offsetof(X509_REQ_INFO, version),
 		.field_name = "version",
 		.item = &ASN1_INTEGER_it,
 	},
 	{
-		.flags = 0,
-		.tag = 0,
 		.offset = offsetof(X509_REQ_INFO, subject),
 		.field_name = "subject",
 		.item = &X509_NAME_it,
 	},
 	{
-		.flags = 0,
-		.tag = 0,
 		.offset = offsetof(X509_REQ_INFO, pubkey),
 		.field_name = "pubkey",
 		.item = &X509_PUBKEY_it,
@@ -127,7 +118,6 @@ static const ASN1_TEMPLATE X509_REQ_INFO_seq_tt[] = {
 	 */
 	{
 		.flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SET_OF | ASN1_TFLG_OPTIONAL,
-		.tag = 0,
 		.offset = offsetof(X509_REQ_INFO, attributes),
 		.field_name = "attributes",
 		.item = &X509_ATTRIBUTE_it,
@@ -175,27 +165,19 @@ static const ASN1_AUX X509_REQ_aux = {
 	.flags = ASN1_AFLG_REFCOUNT,
 	.ref_offset = offsetof(X509_REQ, references),
 	.ref_lock = CRYPTO_LOCK_X509_REQ,
-	.asn1_cb = 0,
-	.enc_offset = 0,
 };
 static const ASN1_TEMPLATE X509_REQ_seq_tt[] = {
 	{
-		.flags = 0,
-		.tag = 0,
 		.offset = offsetof(X509_REQ, req_info),
 		.field_name = "req_info",
 		.item = &X509_REQ_INFO_it,
 	},
 	{
-		.flags = 0,
-		.tag = 0,
 		.offset = offsetof(X509_REQ, sig_alg),
 		.field_name = "sig_alg",
 		.item = &X509_ALGOR_it,
 	},
 	{
-		.flags = 0,
-		.tag = 0,
 		.offset = offsetof(X509_REQ, signature),
 		.field_name = "signature",
 		.item = &ASN1_BIT_STRING_it,
-- 
cgit v1.2.3