diff options
| author | Andy Polyakov <appro@openssl.org> | 2013-01-19 18:10:05 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2013-01-19 18:10:05 +0100 |
| commit | a0dcb8d821db2757c50ec5c8e1729c4fe723b5b1 (patch) | |
| tree | a81b654bc95ef41b741b8a81e12bfd7f555516c8 | |
| parent | 26906f2d93ad4bc092b8b5783d1b35f8c9f0c6d8 (diff) | |
gost_crypt.c: add assertions.
Submitted by: Seguei Leontiev
PR: 2821
| -rw-r--r-- | engines/ccgost/gost_crypt.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/engines/ccgost/gost_crypt.c b/engines/ccgost/gost_crypt.c index 0d62286f41..52aef15acf 100644 --- a/engines/ccgost/gost_crypt.c +++ b/engines/ccgost/gost_crypt.c @@ -11,6 +11,14 @@ #include <openssl/rand.h> #include "e_gost_err.h" #include "gost_lcl.h" + +#if !defined(CCGOST_DEBUG) && !defined(DEBUG) +# ifndef NDEBUG +# define NDEBUG +# endif +#endif +#include <assert.h> + static int gost_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc); static int gost_cipher_init_cpa(EVP_CIPHER_CTX *ctx, const unsigned char *key, @@ -206,6 +214,7 @@ int gost_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, static void gost_crypt_mesh (void *ctx,unsigned char *iv,unsigned char *buf) { struct ossl_gost_cipher_ctx *c = ctx; + assert(c->count%8 == 0 && c->count <= 1024); if (c->key_meshing && c->count==1024) { cryptopro_key_meshing(&(c->cctx),iv); @@ -219,6 +228,7 @@ static void gost_cnt_next (void *ctx, unsigned char *iv, unsigned char *buf) struct ossl_gost_cipher_ctx *c = ctx; word32 g,go; unsigned char buf1[8]; + assert(c->count%8 == 0 && c->count <= 1024); if (c->key_meshing && c->count==1024) { cryptopro_key_meshing(&(c->cctx),iv); @@ -511,6 +521,7 @@ static void mac_block_mesh(struct ossl_gost_imit_ctx *c,const unsigned char *dat * interpret internal state of MAC algorithm as iv during keymeshing * (but does initialize internal state from iv in key transport */ + assert(c->count%8 == 0 && c->count <= 1024); if (c->key_meshing && c->count==1024) { cryptopro_key_meshing(&(c->cctx),buffer); |