Merge remote-tracking branch 'origin/openssl_1_1_0'

[openssl-gost/engine.git] / gost_asn1.c

diff --git a/gost_asn1.c b/gost_asn1.c
index bcfe73fa84cc344434b3f36f7501d4c7fab4599f..0a1c05a8afd0dd11fdf073d458e43d8c3bba66aa 100644 (file)
--- a/gost_asn1.c
+++ b/gost_asn1.c
@@ -22,29 +22,23 @@ IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_TRANSPORT)
 ASN1_NDEF_SEQUENCE(GOST_KEY_INFO) =
 {
     ASN1_SIMPLE(GOST_KEY_INFO, encrypted_key, ASN1_OCTET_STRING),
-    ASN1_SIMPLE(GOST_KEY_INFO, imit, ASN1_OCTET_STRING)
-}
-ASN1_NDEF_SEQUENCE_END(GOST_KEY_INFO)
+        ASN1_SIMPLE(GOST_KEY_INFO, imit, ASN1_OCTET_STRING)
+} ASN1_NDEF_SEQUENCE_END(GOST_KEY_INFO)
 IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_INFO)
-
 ASN1_NDEF_SEQUENCE(GOST_KEY_AGREEMENT_INFO) =
 {
     ASN1_SIMPLE(GOST_KEY_AGREEMENT_INFO, cipher, ASN1_OBJECT),
-    ASN1_IMP_OPT(GOST_KEY_AGREEMENT_INFO, ephem_key, X509_PUBKEY, 0),
-    ASN1_SIMPLE(GOST_KEY_AGREEMENT_INFO, eph_iv, ASN1_OCTET_STRING)
-}
-ASN1_NDEF_SEQUENCE_END(GOST_KEY_AGREEMENT_INFO)
+        ASN1_IMP_OPT(GOST_KEY_AGREEMENT_INFO, ephem_key, X509_PUBKEY, 0),
+        ASN1_SIMPLE(GOST_KEY_AGREEMENT_INFO, eph_iv, ASN1_OCTET_STRING)
+} ASN1_NDEF_SEQUENCE_END(GOST_KEY_AGREEMENT_INFO)
 IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_AGREEMENT_INFO)
-
 ASN1_NDEF_SEQUENCE(GOST_KEY_PARAMS) =
 {
-    ASN1_SIMPLE(GOST_KEY_PARAMS, key_params, ASN1_OBJECT),
-    ASN1_SIMPLE(GOST_KEY_PARAMS, hash_params, ASN1_OBJECT),
-    ASN1_OPT(GOST_KEY_PARAMS, cipher_params, ASN1_OBJECT),
-}
-ASN1_NDEF_SEQUENCE_END(GOST_KEY_PARAMS)
+ASN1_SIMPLE(GOST_KEY_PARAMS, key_params, ASN1_OBJECT),
+        ASN1_SIMPLE(GOST_KEY_PARAMS, hash_params, ASN1_OBJECT),
+        ASN1_OPT(GOST_KEY_PARAMS, cipher_params,
+                     ASN1_OBJECT),} ASN1_NDEF_SEQUENCE_END(GOST_KEY_PARAMS)
 IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_PARAMS)
-
 ASN1_NDEF_SEQUENCE(GOST_CIPHER_PARAMS) =
 {
     ASN1_SIMPLE(GOST_CIPHER_PARAMS, iv, ASN1_OCTET_STRING),
@@ -52,7 +46,6 @@ ASN1_NDEF_SEQUENCE(GOST_CIPHER_PARAMS) =
 }
 ASN1_NDEF_SEQUENCE_END(GOST_CIPHER_PARAMS)
 IMPLEMENT_ASN1_FUNCTIONS(GOST_CIPHER_PARAMS)
-
 ASN1_NDEF_SEQUENCE(GOST_CLIENT_KEY_EXCHANGE_PARAMS) =
 {                               /* FIXME incomplete */
     ASN1_SIMPLE(GOST_CLIENT_KEY_EXCHANGE_PARAMS, gkt, GOST_KEY_TRANSPORT)
@@ -63,7 +56,6 @@ IMPLEMENT_ASN1_FUNCTIONS(GOST_CLIENT_KEY_EXCHANGE_PARAMS)
 ASN1_NDEF_SEQUENCE(MASKED_GOST_KEY) =
 {
     ASN1_SIMPLE(MASKED_GOST_KEY, masked_priv_key, ASN1_OCTET_STRING),
-    ASN1_SIMPLE(MASKED_GOST_KEY, public_key, ASN1_OCTET_STRING)
-}
-ASN1_NDEF_SEQUENCE_END(MASKED_GOST_KEY)
+        ASN1_SIMPLE(MASKED_GOST_KEY, public_key, ASN1_OCTET_STRING)
+} ASN1_NDEF_SEQUENCE_END(MASKED_GOST_KEY)
 IMPLEMENT_ASN1_FUNCTIONS(MASKED_GOST_KEY)