Commit 5f590d22 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 1887 (part) 

Submitted by: "Victor B. Wagner" <vitus@cryptocom.ru>
Approved by: steve@openssl.org

Added error codes for ccgost.
parent 791b7bc7

engines/ccgost/e_gost_err.c

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ static ERR_STRING_DATA GOST_str_functs[]= 
{ERR_FUNC(GOST_F_GOST_DO_SIGN),	"GOST_DO_SIGN"},

{ERR_FUNC(GOST_F_GOST_DO_VERIFY),	"GOST_DO_VERIFY"},

{ERR_FUNC(GOST_F_GOST_IMIT_CTRL),	"GOST_IMIT_CTRL"},

{ERR_FUNC(GOST_F_GOST_IMIT_FINAL),	"GOST_IMIT_FINAL"},

{ERR_FUNC(GOST_F_GOST_IMIT_UPDATE),	"GOST_IMIT_UPDATE"},

{ERR_FUNC(GOST_F_PARAM_COPY_GOST01),	"PARAM_COPY_GOST01"},

{ERR_FUNC(GOST_F_PARAM_COPY_GOST94),	"PARAM_COPY_GOST94"},

engines/ccgost/e_gost_err.h

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ void ERR_GOST_error(int function, int reason, char *file, int line); 
#define GOST_F_GOST_DO_SIGN				 112

#define GOST_F_GOST_DO_VERIFY				 113

#define GOST_F_GOST_IMIT_CTRL				 114

#define GOST_F_GOST_IMIT_FINAL				 140

#define GOST_F_GOST_IMIT_UPDATE				 115

#define GOST_F_PARAM_COPY_GOST01			 116

#define GOST_F_PARAM_COPY_GOST94			 117

engines/ccgost/gost_crypt.c

+4 −1
Original line number Diff line number Diff line
@@ -550,7 +550,10 @@ int gost_imit_update(EVP_MD_CTX *ctx, const void *data, size_t count) 
int gost_imit_final(EVP_MD_CTX *ctx,unsigned char *md)

	{

	struct ossl_gost_imit_ctx *c = ctx->md_data;

	if (!c->key_set) return 0;

	if (!c->key_set) {

		GOSTerr(GOST_F_GOST_IMIT_FINAL, GOST_R_MAC_KEY_NOT_SET);

		return 0;

	}

	if (c->bytes_left)

		{

		int i;