generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

engines/ccgost: GOST fixes [from master].

Browse Source 
Submitted by: Dmitry Belyavsky, Seguei Leontiev
PR: 2821
This commit is contained in:
Andy Polyakov 2013-01-19 18:24:03 +01:00
parent 4782444a35
commit 366b60b9da
3 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/ccgost/gost89.c
View File

@ -369,7 +369,13 @@ int gost_mac(gost_ctx *ctx,int mac_len,const unsigned char *data,
memset(buf2,0,8); memset(buf2,0,8);
memcpy(buf2,data+i,data_len-i); memcpy(buf2,data+i,data_len-i);
mac_block(ctx,buffer,buf2); mac_block(ctx,buffer,buf2);
} i+=8;
}
if (i==8)
{
memset(buf2,0,8);
mac_block(ctx,buffer,buf2);
}
get_mac(buffer,mac_len,mac); get_mac(buffer,mac_len,mac);
return 1; return 1;
} }
@ -389,7 +395,13 @@ int gost_mac_iv(gost_ctx *ctx,int mac_len,const unsigned char *iv,const unsigned
memset(buf2,0,8); memset(buf2,0,8);
memcpy(buf2,data+i,data_len-i); memcpy(buf2,data+i,data_len-i);
mac_block(ctx,buffer,buf2); mac_block(ctx,buffer,buf2);
i+=8;
} }
if (i==8)
{
memset(buf2,0,8);
mac_block(ctx,buffer,buf2);
}
get_mac(buffer,mac_len,mac); get_mac(buffer,mac_len,mac);
return 1; return 1;
} }

29
engines/ccgost/gost_crypt.c
View File

@ -11,6 +11,14 @@
#include <openssl/rand.h> #include <openssl/rand.h>
#include "e_gost_err.h" #include "e_gost_err.h"
#include "gost_lcl.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, static int gost_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc); const unsigned char *iv, int enc);
static int gost_cipher_init_cpa(EVP_CIPHER_CTX *ctx, const unsigned char *key, static int gost_cipher_init_cpa(EVP_CIPHER_CTX *ctx, const unsigned char *key,
@ -206,12 +214,13 @@ 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) static void gost_crypt_mesh (void *ctx,unsigned char *iv,unsigned char *buf)
{ {
struct ossl_gost_cipher_ctx *c = ctx; struct ossl_gost_cipher_ctx *c = ctx;
if (c->count&&c->key_meshing && c->count%1024==0) assert(c->count%8 == 0 && c->count <= 1024);
if (c->key_meshing && c->count==1024)
{ {
cryptopro_key_meshing(&(c->cctx),iv); cryptopro_key_meshing(&(c->cctx),iv);
} }
gostcrypt(&(c->cctx),iv,buf); gostcrypt(&(c->cctx),iv,buf);
c->count+=8; c->count = c->count%1024 + 8;
} }
static void gost_cnt_next (void *ctx, unsigned char *iv, unsigned char *buf) static void gost_cnt_next (void *ctx, unsigned char *iv, unsigned char *buf)
@ -219,7 +228,8 @@ static void gost_cnt_next (void *ctx, unsigned char *iv, unsigned char *buf)
struct ossl_gost_cipher_ctx *c = ctx; struct ossl_gost_cipher_ctx *c = ctx;
word32 g,go; word32 g,go;
unsigned char buf1[8]; unsigned char buf1[8];
if (c->count && c->key_meshing && c->count %1024 ==0) assert(c->count%8 == 0 && c->count <= 1024);
if (c->key_meshing && c->count==1024)
{ {
cryptopro_key_meshing(&(c->cctx),iv); cryptopro_key_meshing(&(c->cctx),iv);
} }
@ -248,7 +258,7 @@ static void gost_cnt_next (void *ctx, unsigned char *iv, unsigned char *buf)
buf1[7]=(unsigned char)((g>>24)&0xff); buf1[7]=(unsigned char)((g>>24)&0xff);
memcpy(iv,buf1,8); memcpy(iv,buf1,8);
gostcrypt(&(c->cctx),buf1,buf); gostcrypt(&(c->cctx),buf1,buf);
c->count +=8; c->count = c->count%1024 + 8;
} }
/* GOST encryption in CFB mode */ /* GOST encryption in CFB mode */
@ -511,12 +521,13 @@ 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 * interpret internal state of MAC algorithm as iv during keymeshing
* (but does initialize internal state from iv in key transport * (but does initialize internal state from iv in key transport
*/ */
if (c->key_meshing&& c->count && c->count %1024 ==0) assert(c->count%8 == 0 && c->count <= 1024);
if (c->key_meshing && c->count==1024)
{ {
cryptopro_key_meshing(&(c->cctx),buffer); cryptopro_key_meshing(&(c->cctx),buffer);
} }
mac_block(&(c->cctx),c->buffer,data); mac_block(&(c->cctx),c->buffer,data);
c->count +=8; c->count = c->count%1024 + 8;
} }
int gost_imit_update(EVP_MD_CTX *ctx, const void *data, size_t count) int gost_imit_update(EVP_MD_CTX *ctx, const void *data, size_t count)
@ -565,6 +576,12 @@ int gost_imit_final(EVP_MD_CTX *ctx,unsigned char *md)
GOSTerr(GOST_F_GOST_IMIT_FINAL, GOST_R_MAC_KEY_NOT_SET); GOSTerr(GOST_F_GOST_IMIT_FINAL, GOST_R_MAC_KEY_NOT_SET);
return 0; return 0;
} }
if (c->count==0 && c->bytes_left)
{
unsigned char buffer[8];
memset(buffer, 0, 8);
gost_imit_update(ctx, buffer, 8);
}
if (c->bytes_left) if (c->bytes_left)
{ {
int i; int i;

4
engines/ccgost/gost_lcl.h
View File

@ -136,7 +136,7 @@ extern EVP_MD imit_gost_cpa;
/* Cipher context used for EVP_CIPHER operation */ /* Cipher context used for EVP_CIPHER operation */
struct ossl_gost_cipher_ctx { struct ossl_gost_cipher_ctx {
int paramNID; int paramNID;
off_t count; unsigned int count;
int key_meshing; int key_meshing;
gost_ctx cctx; gost_ctx cctx;
}; };
@ -151,7 +151,7 @@ struct ossl_gost_imit_ctx {
gost_ctx cctx; gost_ctx cctx;
unsigned char buffer[8]; unsigned char buffer[8];
unsigned char partial_block[8]; unsigned char partial_block[8];
off_t count; unsigned int count;
int key_meshing; int key_meshing;
int bytes_left; int bytes_left;
int key_set; int key_set;