diff options
| author | boggard <varyanik2@gmail.com> | 2017-07-12 21:25:35 +0300 |
|---|---|---|
| committer | boggard <varyanik2@gmail.com> | 2017-07-12 21:25:35 +0300 |
| commit | e83825355b2cecd853b9a9735ae7751cb5a90975 (patch) | |
| tree | 15fc5679b244ec9c6289452560e790b7a3f6d77c | |
| parent | 82d1ac30943cbe9223f024466404e7be720379b6 (diff) | |
| download | gost-engine-e83825355b2cecd853b9a9735ae7751cb5a90975.zip gost-engine-e83825355b2cecd853b9a9735ae7751cb5a90975.tar.gz gost-engine-e83825355b2cecd853b9a9735ae7751cb5a90975.tar.bz2 | |
Some other renames
| -rw-r--r-- | gost_ameth.c | 4 | ||||
| -rw-r--r-- | gost_ctl.c | 6 | ||||
| -rw-r--r-- | gost_lcl.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/gost_ameth.c b/gost_ameth.c index 437362c..12ea593 100644 --- a/gost_ameth.c +++ b/gost_ameth.c @@ -442,8 +442,8 @@ 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_WRAP_PARAM) == 0) { + const char *pk_format = get_gost_engine_param(GOST_PARAM_PK_FORMAT); + if(pk_format != NULL && strcmp(pk_format, PK_WRAP_PARAM) == 0) { ASN1_STRING *octet = NULL; int priv_len = 0; unsigned char *priv_buf = NULL; @@ -15,7 +15,7 @@ #include "gost_lcl.h" static char *gost_params[GOST_PARAM_MAX + 1] = { NULL }; -static const char *gost_envnames[] = { "CRYPT_PARAMS", "GOST_PBE_HMAC", "PK_PARAMS" }; +static const char *gost_envnames[] = { "CRYPT_PARAMS", "GOST_PBE_HMAC", "GOST_PK_FORMAT" }; const ENGINE_CMD_DEFN gost_cmds[] = { {GOST_CTRL_CRYPT_PARAMS, @@ -26,8 +26,8 @@ const ENGINE_CMD_DEFN gost_cmds[] = { "PBE_PARAMS", "Shortname of default digest alg for PBE", ENGINE_CMD_FLAG_STRING}, - {GOST_CTRL_PK_PARAMS, - "PK_PARAMS", + {GOST_CTRL_PK_FORMAT, + "GOST_PK_FORMAT", "Private key format params", ENGINE_CMD_FLAG_STRING}, {0, NULL, NULL, 0} @@ -21,11 +21,11 @@ /* Control commands */ # define GOST_PARAM_CRYPT_PARAMS 0 # define GOST_PARAM_PBE_PARAMS 1 -# define GOST_PARAM_PK_PARAMS 2 +# define GOST_PARAM_PK_FORMAT 2 # define GOST_PARAM_MAX 2 # define GOST_CTRL_CRYPT_PARAMS (ENGINE_CMD_BASE+GOST_PARAM_CRYPT_PARAMS) # define GOST_CTRL_PBE_PARAMS (ENGINE_CMD_BASE+GOST_PARAM_PBE_PARAMS) -# define GOST_CTRL_PK_PARAMS (ENGINE_CMD_BASE+GOST_PARAM_PK_PARAMS) +# define GOST_CTRL_PK_FORMAT (ENGINE_CMD_BASE+GOST_PARAM_PK_FORMAT) typedef struct R3410_ec { int nid; |