From 51bc37ca82a81742c0dda02bfa7d4a2ae67acab6 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 17 Feb 2016 12:34:36 +0100 Subject: [PATCH] Fixup the horror of automatic source reformatting --- gost_asn1.c | 72 +++++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 33 deletions(-) diff --git a/gost_asn1.c b/gost_asn1.c index fb9792a..bcfe73f 100644 --- a/gost_asn1.c +++ b/gost_asn1.c @@ -13,51 +13,57 @@ ASN1_NDEF_SEQUENCE(GOST_KEY_TRANSPORT) = { ASN1_SIMPLE(GOST_KEY_TRANSPORT, key_info, GOST_KEY_INFO), - ASN1_IMP(GOST_KEY_TRANSPORT, key_agreement_info, - GOST_KEY_AGREEMENT_INFO, 0) + ASN1_IMP(GOST_KEY_TRANSPORT, key_agreement_info, + GOST_KEY_AGREEMENT_INFO, 0) } - ASN1_NDEF_SEQUENCE_END(GOST_KEY_TRANSPORT) +IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_TRANSPORT) - IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_TRANSPORT) - - ASN1_NDEF_SEQUENCE(GOST_KEY_INFO) = +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) - IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_INFO) - ASN1_NDEF_SEQUENCE(GOST_KEY_AGREEMENT_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) - IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_AGREEMENT_INFO) - ASN1_NDEF_SEQUENCE(GOST_KEY_PARAMS) = + 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) - IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_PARAMS) - ASN1_NDEF_SEQUENCE(GOST_CIPHER_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), - ASN1_SIMPLE(GOST_CIPHER_PARAMS, enc_param_set, - ASN1_OBJECT),} + ASN1_SIMPLE(GOST_CIPHER_PARAMS, iv, ASN1_OCTET_STRING), + ASN1_SIMPLE(GOST_CIPHER_PARAMS, enc_param_set, ASN1_OBJECT), +} ASN1_NDEF_SEQUENCE_END(GOST_CIPHER_PARAMS) - IMPLEMENT_ASN1_FUNCTIONS(GOST_CIPHER_PARAMS) - ASN1_NDEF_SEQUENCE(GOST_CLIENT_KEY_EXCHANGE_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) -} ASN1_NDEF_SEQUENCE_END(GOST_CLIENT_KEY_EXCHANGE_PARAMS) - - IMPLEMENT_ASN1_FUNCTIONS(GOST_CLIENT_KEY_EXCHANGE_PARAMS) +} +ASN1_NDEF_SEQUENCE_END(GOST_CLIENT_KEY_EXCHANGE_PARAMS) +IMPLEMENT_ASN1_FUNCTIONS(GOST_CLIENT_KEY_EXCHANGE_PARAMS) - ASN1_NDEF_SEQUENCE(MASKED_GOST_KEY) = +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) - IMPLEMENT_ASN1_FUNCTIONS(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) -- 2.39.2