From: boggard <varyanik2@gmail.com>
Date: Wed, 12 Jul 2017 18:01:56 +0000 (+0300)
Subject: Variable has renamed and documentation has changed
X-Git-Tag: v3.0.0~437^2~1
X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=commitdiff_plain;h=82d1ac30943cbe9223f024466404e7be720379b6;hp=f8a4b31268d06d4deea274a7d3e644cf4f84e386;p=openssl-gost%2Fengine.git

Variable has renamed and documentation has changed
---

diff --git a/README.gost b/README.gost
index d6d5464..74c5eb2 100644
--- a/README.gost
+++ b/README.gost
@@ -81,8 +81,10 @@ And section which describes configuration of the engine should contain
 	default_algorithms = ALL
 	CRYPT_PARAMS = id-Gost28147-89-CryptoPro-A-ParamSet
 
-If you want use unmask private key format, you must add:
-  PK_PARAMS = UNMASK
+BouncyCastle cryptoprovider has some problems with private key parsing from PrivateKeyInfo,
+so if you want to use old private key representation format, which supported by BC,
+you must add:
+  PK_PARAMS = LEGACY_PK_WRAP
 to [gost_section]
 
 Where engine_id parameter specifies name of engine (should be "gost").
diff --git a/gost_ameth.c b/gost_ameth.c
index b2d6aba..437362c 100644
--- a/gost_ameth.c
+++ b/gost_ameth.c
@@ -19,7 +19,7 @@
 #include "gost_lcl.h"
 #include "e_gost_err.h"
 
-#define PK_UNMASK_PARAM "UNMASK"
+#define PK_WRAP_PARAM "LEGACY_PK_WRAP"
 
 /*
  * Pack bignum into byte buffer of given size, filling all leading bytes by
@@ -443,7 +443,7 @@ static int priv_encode_gost(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk)
 
     /* unmasked private key */
     const char *pk_param = get_gost_engine_param(GOST_PARAM_PK_PARAMS);
-    if(pk_param != NULL && strcmp(pk_param, PK_UNMASK_PARAM) == 0) {
+    if(pk_param != NULL && strcmp(pk_param, PK_WRAP_PARAM) == 0) {
         ASN1_STRING *octet = NULL;
         int priv_len = 0;
         unsigned char *priv_buf = NULL;