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

UKM must be set
---

diff --git a/gost_ec_keyx.c b/gost_ec_keyx.c
index deca4f5..4a0eb82 100644
--- a/gost_ec_keyx.c
+++ b/gost_ec_keyx.c
@@ -615,6 +615,19 @@ static int pkey_gost2018_decrypt(EVP_PKEY_CTX *pctx, unsigned char *key,
 
    o  q * Q_eph is not equal to zero point.
 */
+    if (data->shared_ukm == NULL && pst->ukm != NULL) {
+        if (EVP_PKEY_CTX_ctrl(pctx, -1, -1, EVP_PKEY_CTRL_SET_IV,
+        ASN1_STRING_length(pst->ukm), (void *)ASN1_STRING_get0_data(pst->ukm)) < 0) {
+            GOSTerr(GOST_F_PKEY_GOST2018_DECRYPT, GOST_R_UKM_NOT_SET);
+            goto err;
+        }
+    }
+
+    if (data->shared_ukm == NULL) {
+        GOSTerr(GOST_F_PKEY_GOST2018_DECRYPT, GOST_R_UKM_NOT_SET);
+        goto err;
+    }
+
     if (gost_keg(data->shared_ukm, pkey_nid,
                  EC_KEY_get0_public_key(EVP_PKEY_get0(eph_key)),
                  EVP_PKEY_get0(priv), expkeys) <= 0) {