From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Sun, 3 May 2020 13:45:26 +0000 (+0300)
Subject: PSKeyTransport_gost includes UKM
X-Git-Tag: v3.0.0~176
X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=commitdiff_plain;h=3b31dea89630ecd3f741171ed3e1d4259adabf0e;p=openssl-gost%2Fengine.git

PSKeyTransport_gost includes UKM
---

diff --git a/gost_asn1.c b/gost_asn1.c
index 1a90702..35b9050 100644
--- 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 4c099dd..9740994 100644
--- 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)