PSKeyTransport_gost includes UKM

diff --git a/gost_asn1.c b/gost_asn1.c
index 1a907025582019b5420d1e7f70ee0464e6d23a12..35b90509ea921c2aa1dc876a453c19d5832cb06f 100644 (file)
--- a/gost_asn1.c
+++ b/gost_asn1.c
@@ -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)

diff --git a/gost_lcl.h b/gost_lcl.h
index 4c099dd27d34315c5b5ec4b635df8007edae75f2..9740994a41c45d2c30e9852a32661437df090e60 100644 (file)
--- a/gost_lcl.h
+++ b/gost_lcl.h
@@ -130,6 +130,7 @@ typedef struct {                /* FIXME incomplete */
 typedef struct PSKeyTransport_st {
     ASN1_OCTET_STRING *psexp;
     X509_PUBKEY       *ephem_key;
+    ASN1_OCTET_STRING *ukm;
 } PSKeyTransport_gost;
 
 DECLARE_ASN1_FUNCTIONS(PSKeyTransport_gost)