X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_asn1.c;h=0a1c05a8afd0dd11fdf073d458e43d8c3bba66aa;hb=69fd79e35b8e8a56c9d2a37681244b4a7771f4b9;hp=3a106c2fc675409e7d5939a34ca30d956e4b2a24;hpb=e2d3705da37abfa9edf270b52178c8c66abc51e7;p=openssl-gost%2Fengine.git diff --git a/gost_asn1.c b/gost_asn1.c index 3a106c2..0a1c05a 100644 --- a/gost_asn1.c +++ b/gost_asn1.c @@ -13,15 +13,13 @@ 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) @@ -43,19 +41,19 @@ ASN1_SIMPLE(GOST_KEY_PARAMS, key_params, ASN1_OBJECT), 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) = { /* 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)