PSKeyTransport_gost includes UKM

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

diff --git a/gost_asn1.c b/gost_asn1.c
index 502d1eb7f75786a5f238ded65fb3223bf531bbee..35b90509ea921c2aa1dc876a453c19d5832cb06f 100644 (file)
--- a/gost_asn1.c
+++ b/gost_asn1.c
@@ -36,7 +36,7 @@ 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, 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)
@@ -65,6 +65,7 @@ IMPLEMENT_ASN1_FUNCTIONS(MASKED_GOST_KEY)
 ASN1_NDEF_SEQUENCE(PSKeyTransport_gost) =
 {
     ASN1_SIMPLE(PSKeyTransport_gost, psexp, ASN1_OCTET_STRING),
-               ASN1_SIMPLE(PSKeyTransport_gost, ephem_key, X509_PUBKEY)
+               ASN1_SIMPLE(PSKeyTransport_gost, ephem_key, X509_PUBKEY),
+               ASN1_OPT(PSKeyTransport_gost, ukm, ASN1_OCTET_STRING)
 } ASN1_NDEF_SEQUENCE_END(PSKeyTransport_gost)
 IMPLEMENT_ASN1_FUNCTIONS(PSKeyTransport_gost)