From 7ce996d12c96ffb936ec22f0a8b826c64516699f Mon Sep 17 00:00:00 2001 From: Nikolay Morozov Date: Mon, 17 Feb 2020 17:01:49 +0300 Subject: [PATCH] cppcheck: function defenition doen't match function declaration --- gost89.h | 22 +++++++++++----------- gost_eng.c | 2 +- gost_lcl.h | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gost89.h b/gost89.h index 1dfae9b..9f36905 100644 --- a/gost89.h +++ b/gost89.h @@ -44,9 +44,9 @@ typedef struct { * Other modes may be added easily enough. */ /* Encrypt several full blocks in ECB mode */ -void gost_enc(gost_ctx * ctx, const byte * clear, byte * cipher, int blocks); +void gost_enc(gost_ctx * c, const byte * clear, byte * cipher, int blocks); /* Decrypt several full blocks in ECB mode */ -void gost_dec(gost_ctx * ctx, const byte * cipher, byte * clear, int blocks); +void gost_dec(gost_ctx * c, const byte * cipher, byte * clear, int blocks); /* Encrypts several full blocks in CFB mode using 8byte IV */ void gost_enc_cfb(gost_ctx * ctx, const byte * iv, const byte * clear, byte * cipher, int blocks); @@ -59,28 +59,28 @@ void gostcrypt(gost_ctx * c, const byte * in, byte * out); /* Decrypt one block */ void gostdecrypt(gost_ctx * c, const byte * in, byte * out); /* Set key into context */ -void gost_key(gost_ctx * ctx, const byte * key); +void gost_key(gost_ctx * c, const byte * k); /* Set key into context */ -void magma_key(gost_ctx * ctx, const byte * key); +void magma_key(gost_ctx * c, const byte * k); /* Get key from context */ -void gost_get_key(gost_ctx * ctx, byte * key); +void gost_get_key(gost_ctx * c, byte * k); /* Set S-blocks into context */ -void gost_init(gost_ctx * ctx, const gost_subst_block * subst_block); +void gost_init(gost_ctx * c, const gost_subst_block * b); /* Clean up context */ -void gost_destroy(gost_ctx * ctx); +void gost_destroy(gost_ctx * c); /* Intermediate function used for calculate hash */ void gost_enc_with_key(gost_ctx *, byte * key, byte * inblock, byte * outblock); /* Compute MAC of given length in bits from data */ -int gost_mac(gost_ctx * ctx, int hmac_len, const unsigned char *data, - unsigned int data_len, unsigned char *hmac); +int gost_mac(gost_ctx * ctx, int mac_len, const unsigned char *data, + unsigned int data_len, unsigned char *mac); /* * Compute MAC of given length in bits from data, using non-zero 8-byte IV * (non-standard, for use in CryptoPro key transport only */ -int gost_mac_iv(gost_ctx * ctx, int hmac_len, const unsigned char *iv, +int gost_mac_iv(gost_ctx * c, int mac_len, const unsigned char *iv, const unsigned char *data, unsigned int data_len, - unsigned char *hmac); + unsigned char *mac); /* Perform one step of MAC calculation like gostcrypt */ void mac_block(gost_ctx * c, byte * buffer, const byte * block); /* Extracts MAC value from mac state buffer */ diff --git a/gost_eng.c b/gost_eng.c index 69f9975..ad6d62b 100644 --- a/gost_eng.c +++ b/gost_eng.c @@ -29,7 +29,7 @@ static int gost_ciphers(ENGINE* e, const EVP_CIPHER** cipher, const int** nids, int nid); static int gost_digests(ENGINE* e, const EVP_MD** digest, - const int** nids, int ind); + const int** nids, int nid); static int gost_pkey_meths(ENGINE* e, EVP_PKEY_METHOD** pmeth, const int** nids, int nid); diff --git a/gost_lcl.h b/gost_lcl.h index bb25ce3..b590bf5 100644 --- a/gost_lcl.h +++ b/gost_lcl.h @@ -247,12 +247,12 @@ void inc_counter(unsigned char *buffer, size_t buf_len); # define EVP_MD_CTRL_SET_KEY (EVP_MD_CTRL_ALG_CTRL+4) /* EVP_PKEY_METHOD key encryption callbacks */ /* From gost_ec_keyx.c */ -int pkey_gost_encrypt(EVP_PKEY_CTX *ctx, unsigned char *out, - size_t *outlen, const unsigned char *key, +int pkey_gost_encrypt(EVP_PKEY_CTX *pctx, unsigned char *out, + size_t *out_len, const unsigned char *key, size_t key_len); -int pkey_gost_decrypt(EVP_PKEY_CTX *ctx, unsigned char *out, - size_t *outlen, const unsigned char *in, +int pkey_gost_decrypt(EVP_PKEY_CTX *pctx, unsigned char *key, + size_t *key_len, const unsigned char *in, size_t in_len); /* derive functions */ /* From gost_ec_keyx.c */ -- 2.39.2