X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_ctl.c;h=60280b1c1322830c37cf9f78ef8b6f109ff537f2;hb=HEAD;hp=1387f7680b8a83d91c4f5a2bd6ebc2e6410889db;hpb=f8a4b31268d06d4deea274a7d3e644cf4f84e386;p=openssl-gost%2Fengine.git diff --git a/gost_ctl.c b/gost_ctl.c index 1387f76..60280b1 100644 --- a/gost_ctl.c +++ b/gost_ctl.c @@ -15,23 +15,8 @@ #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" }; - -const ENGINE_CMD_DEFN gost_cmds[] = { - {GOST_CTRL_CRYPT_PARAMS, - "CRYPT_PARAMS", - "OID of default GOST 28147-89 parameters", - ENGINE_CMD_FLAG_STRING}, - {GOST_CTRL_PBE_PARAMS, - "PBE_PARAMS", - "Shortname of default digest alg for PBE", - ENGINE_CMD_FLAG_STRING}, - {GOST_CTRL_PK_PARAMS, - "PK_PARAMS", - "Private key format params", - ENGINE_CMD_FLAG_STRING}, - {0, NULL, NULL, 0} -}; +static const char *gost_envnames[] = + { "CRYPT_PARAMS", "GOST_PBE_HMAC", "GOST_PK_FORMAT" }; void gost_param_free() { @@ -58,7 +43,7 @@ int gost_control_func(ENGINE *e, int cmd, long i, void *p, void (*f) (void)) const char *get_gost_engine_param(int param) { char *tmp; - if (param < 0 || param > GOST_PARAM_MAX) + if (param < 0 || param >= GOST_PARAM_MAX) return NULL; if (gost_params[param] != NULL) { return gost_params[param]; @@ -75,7 +60,7 @@ const char *get_gost_engine_param(int param) int gost_set_default_param(int param, const char *value) { const char *tmp; - if (param < 0 || param > GOST_PARAM_MAX) + if (param < 0 || param >= GOST_PARAM_MAX) return 0; tmp = getenv(gost_envnames[param]);