From: Dmitry Belyavskiy Date: Fri, 1 May 2020 09:22:43 +0000 (+0300) Subject: Fix code aligning X-Git-Tag: v3.0.0~184 X-Git-Url: http://www.wagner.pp.ru/gitweb/?a=commitdiff_plain;h=96ca13301197c0a60962e97898bfffbb8dbf4ba5;p=openssl-gost%2Fengine.git Fix code aligning --- diff --git a/gost_pmeth.c b/gost_pmeth.c index 6442644..cac31e8 100644 --- a/gost_pmeth.c +++ b/gost_pmeth.c @@ -180,22 +180,22 @@ static int pkey_gost_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) static int pkey_gost_ec_ctrl_str_common(EVP_PKEY_CTX *ctx, const char *type, const char *value) { - if (0 == strcmp(type, ukm_ctrl_string)) { - unsigned char ukm_buf[32], *tmp = NULL; - long len = 0; - tmp = OPENSSL_hexstr2buf(value, &len); - if (tmp == NULL) - return 0; - - if (len > 32) { - OPENSSL_free(tmp); - GOSTerr(GOST_F_PKEY_GOST_EC_CTRL_STR_COMMON, GOST_R_CTRL_CALL_FAILED); - return 0; - } - memcpy(ukm_buf, tmp, len); - - return pkey_gost_ctrl(ctx, EVP_PKEY_CTRL_SET_IV, len, ukm_buf); - } + if (0 == strcmp(type, ukm_ctrl_string)) { + unsigned char ukm_buf[32], *tmp = NULL; + long len = 0; + tmp = OPENSSL_hexstr2buf(value, &len); + if (tmp == NULL) + return 0; + + if (len > 32) { + OPENSSL_free(tmp); + GOSTerr(GOST_F_PKEY_GOST_EC_CTRL_STR_COMMON, GOST_R_CTRL_CALL_FAILED); + return 0; + } + memcpy(ukm_buf, tmp, len); + + return pkey_gost_ctrl(ctx, EVP_PKEY_CTRL_SET_IV, len, ukm_buf); + } return -2; } @@ -277,7 +277,7 @@ static int pkey_gost_ec_ctrl_str_256(EVP_PKEY_CTX *ctx, param_nid, NULL); } - return pkey_gost_ec_ctrl_str_common(ctx, type, value); + return pkey_gost_ec_ctrl_str_common(ctx, type, value); } static int pkey_gost_ec_ctrl_str_512(EVP_PKEY_CTX *ctx, @@ -286,7 +286,7 @@ static int pkey_gost_ec_ctrl_str_512(EVP_PKEY_CTX *ctx, int param_nid = NID_undef; if (strcmp(type, param_ctrl_string)) - return pkey_gost_ec_ctrl_str_common(ctx, type, value); + return pkey_gost_ec_ctrl_str_common(ctx, type, value); if (!value) return 0;