diff options
Diffstat (limited to 'gost_asn1.c')
| -rw-r--r-- | gost_asn1.c | 71 |
1 files changed, 36 insertions, 35 deletions
diff --git a/gost_asn1.c b/gost_asn1.c index 57046a8..fb9792a 100644 --- a/gost_asn1.c +++ b/gost_asn1.c @@ -12,51 +12,52 @@ #include "gost_lcl.h" 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_NDEF_SEQUENCE_END(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) +} -IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_TRANSPORT) +ASN1_NDEF_SEQUENCE_END(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) - -IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_INFO) + IMPLEMENT_ASN1_FUNCTIONS(GOST_KEY_TRANSPORT) -ASN1_NDEF_SEQUENCE(GOST_KEY_AGREEMENT_INFO) = { - ASN1_SIMPLE(GOST_KEY_AGREEMENT_INFO, cipher, ASN1_OBJECT), + 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_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_SIMPLE(GOST_KEY_PARAMS, key_params, ASN1_OBJECT), + 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_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_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_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) + 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_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) |