X-Git-Url: https://wagner.pp.ru/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gost_asn1.c;h=3a106c2fc675409e7d5939a34ca30d956e4b2a24;hb=5f30387f2fa0d016f61c102e090a7eba591c774f;hp=fb9792a7fbe5c9aad1eb028843b8269ae5c4eefb;hpb=096f193c98ffbe23686f10c834b2c42092b65954;p=openssl-gost%2Fengine.git diff --git a/gost_asn1.c b/gost_asn1.c index fb9792a..3a106c2 100644 --- a/gost_asn1.c +++ b/gost_asn1.c @@ -26,29 +26,29 @@ ASN1_NDEF_SEQUENCE_END(GOST_KEY_TRANSPORT) 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) = +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) = +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) = +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_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) @@ -60,4 +60,4 @@ ASN1_NDEF_SEQUENCE_END(GOST_CIPHER_PARAMS) 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) +IMPLEMENT_ASN1_FUNCTIONS(MASKED_GOST_KEY)