X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_asn1.c;h=cb8883eb5463d4104f723b8a300559636eaac892;hb=3dddb788511c758e2d851226e75aa01d23c14190;hp=502d1eb7f75786a5f238ded65fb3223bf531bbee;hpb=fd12b88c3392a300d94421f62cf870be8d4ef430;p=openssl-gost%2Fengine.git

diff --git a/gost_asn1.c b/gost_asn1.c
index 502d1eb..cb8883e 100644
--- 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)
@@ -48,6 +48,11 @@ ASN1_NDEF_SEQUENCE(GOST_CIPHER_PARAMS) =
 } ASN1_NDEF_SEQUENCE_END(GOST_CIPHER_PARAMS)
 IMPLEMENT_ASN1_FUNCTIONS(GOST_CIPHER_PARAMS)
 
+ASN1_NDEF_SEQUENCE(GOST2015_CIPHER_PARAMS) = {
+	ASN1_SIMPLE(GOST2015_CIPHER_PARAMS, ukm, ASN1_OCTET_STRING),
+} ASN1_NDEF_SEQUENCE_END(GOST2015_CIPHER_PARAMS)
+IMPLEMENT_ASN1_FUNCTIONS(GOST2015_CIPHER_PARAMS)
+
 ASN1_NDEF_SEQUENCE(GOST_CLIENT_KEY_EXCHANGE_PARAMS) =
 {                               /* FIXME incomplete */
     ASN1_SIMPLE(GOST_CLIENT_KEY_EXCHANGE_PARAMS, gkt, GOST_KEY_TRANSPORT)
@@ -65,6 +70,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)