X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=engines%2Fccgost%2Fgost_crypt.c;h=a9536dd8a4cb23cec3a6e033fa5b363eb793998b;hp=fca7b2d9d53dbd811fdb22e891e61bfee2567524;hb=2c618ab99348207e36b8de47d66099c1c46bc173;hpb=53ca4761cce35e319274f3b82a938403dca1fe83

diff --git a/engines/ccgost/gost_crypt.c b/engines/ccgost/gost_crypt.c
index fca7b2d9d5..a9536dd8a4 100644
--- a/engines/ccgost/gost_crypt.c
+++ b/engines/ccgost/gost_crypt.c
@@ -13,21 +13,14 @@
 #include "gost_lcl.h"
 static int gost_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key, 
 	const unsigned char *iv, int enc);
-#ifdef USE_SSL
-/* Specialized init functions which set specific parameters */			
-static int	gost_cipher_init_vizir(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,
 	const unsigned char *iv, int enc);
-#endif
 /* Handles block of data in CFB mode */			
 static int	gost_cipher_do_cfb(EVP_CIPHER_CTX *ctx, unsigned char *out,
-	const unsigned char *in, unsigned int inl);
-#if 0
+	const unsigned char *in, size_t inl);
 /* Handles block of data in CNT mode */			
 static int	gost_cipher_do_cnt(EVP_CIPHER_CTX *ctx, unsigned char *out,
-	const unsigned char *in, unsigned int inl);
-#endif
+	const unsigned char *in, size_t inl);
 /* Cleanup function */			
 static int gost_cipher_cleanup(EVP_CIPHER_CTX *);
 /* set/get cipher parameters */
@@ -54,28 +47,9 @@ EVP_CIPHER cipher_gost =
 	NULL,
 	};
 
-#ifdef USE_SSL
-static EVP_CIPHER cipher_gost_vizircfb = 
+EVP_CIPHER cipher_gost_cpacnt = 
 	{
-	NID_undef,
-	1,/*block_size*/
-	32,/*key_size*/
-	8,/*iv_len - ñèíõðîïîñûëêà*/
-	EVP_CIPH_CFB_MODE| EVP_CIPH_NO_PADDING |
-	EVP_CIPH_CUSTOM_IV| EVP_CIPH_RAND_KEY | EVP_CIPH_ALWAYS_CALL_INIT,
-	gost_cipher_init_vizir,
-	gost_cipher_do_cfb,
-	gost_cipher_cleanup,
-	sizeof(struct ossl_gost_cipher_ctx), /* ctx_size */
-	gost89_set_asn1_parameters,
-	gost89_get_asn1_parameters,
-	gost_cipher_ctl,
-	NULL,
-	};
-
-static EVP_CIPHER cipher_gost_cpacnt = 
-	{
-	NID_undef,
+	NID_gost89_cnt,
 	1,/*block_size*/
 	32,/*key_size*/
 	8,/*iv_len - ñèíõðîïîñûëêà*/
@@ -90,9 +64,9 @@ static EVP_CIPHER cipher_gost_cpacnt =
 	gost_cipher_ctl,
 	NULL,
 	};
+
 /* Implementation of GOST 28147-89 in MAC (imitovstavka) mode */
 /* Init functions which set specific parameters */
-static int gost_imit_init_vizir(EVP_MD_CTX *ctx);
 static int gost_imit_init_cpa(EVP_MD_CTX *ctx);
 /* process block of data */
 static int gost_imit_update(EVP_MD_CTX *ctx, const void *data, size_t count);
@@ -104,45 +78,25 @@ static int gost_imit_cleanup(EVP_MD_CTX *ctx);
 /* Control function, knows how to set MAC key.*/
 static int gost_imit_ctrl(EVP_MD_CTX *ctx,int type, int arg, void *ptr);
 
-EVP_MD imit_gost_vizir =
-	{
-	NID_undef,
-	NID_undef,
-	4,
-	EVP_MD_FLAG_NEEDS_KEY,
-	gost_imit_init_vizir,
-	gost_imit_update,
-	gost_imit_final,
-	gost_imit_copy,
-	gost_imit_cleanup,
-	gost_imit_ctrl,
-	NULL,
-	NULL,
-	{0,0,0,0,0},
-	8,
-	sizeof(struct ossl_gost_imit_ctx) 
-	};
-
 EVP_MD imit_gost_cpa =
 	{
-	NID_undef,
+	NID_id_Gost28147_89_MAC,
 	NID_undef,
 	4,
-	EVP_MD_FLAG_NEEDS_KEY,
+	0,
 	gost_imit_init_cpa,
 	gost_imit_update,
 	gost_imit_final,
 	gost_imit_copy,
 	gost_imit_cleanup,
-	gost_imit_ctrl,
 	NULL,
 	NULL,
 	{0,0,0,0,0},
 	8,
-	sizeof(struct ossl_gost_imit_ctx) 
+	sizeof(struct ossl_gost_imit_ctx), 
+	gost_imit_ctrl
 	};
 
-#endif
 /* 
  * Correspondence between gost parameter OIDs and substitution blocks
  * NID field is filed by register_gost_NID function in engine.c
@@ -173,7 +127,7 @@ const struct gost_cipher_info *get_encryption_params(ASN1_OBJECT *obj)
 		{
 		const char * params = get_gost_engine_param(GOST_PARAM_CRYPT_PARAMS);
 		if (!params || !strlen(params)) 
-			return &gost_cipher_list[0];
+			return &gost_cipher_list[1];
 
 		nid = OBJ_txt2nid(params);
 		if (nid == NID_undef)
@@ -227,8 +181,6 @@ static int gost_cipher_init_param(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 	return 1;
 	}	
 
-#ifdef USE_SSL
-/* Initializes EVP_CIPHER_CTX with fixed cryptopro A paramset */
 static int gost_cipher_init_cpa(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 	const unsigned char *iv, int enc)
 	{
@@ -236,28 +188,12 @@ static int gost_cipher_init_cpa(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 	gost_init(&(c->cctx),&Gost28147_CryptoProParamSetA);
 	c->key_meshing=1;
 	c->count=0;
-	gost_key(&(c->cctx),key);
+	if(key) gost_key(&(c->cctx),key);
 	if(iv) memcpy(ctx->oiv, iv, EVP_CIPHER_CTX_iv_length(ctx));
 	memcpy(ctx->iv, ctx->oiv, EVP_CIPHER_CTX_iv_length(ctx));
 	return 1;
 	}
 
-/* Initializes EVP_CIPHER_CTX with fixed vizir paramset */
-static int gost_cipher_init_vizir(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-	const unsigned char *iv, int enc)
-	{
-	struct ossl_gost_cipher_ctx *c=ctx->cipher_data;
-	gost_init(&(c->cctx),&GostR3411_94_CryptoProParamSet);
-	c->key_meshing=0;
-	c->count=0;
-	gost_key(&(c->cctx),key);
-
-	if(iv) memcpy(ctx->oiv, iv, EVP_CIPHER_CTX_iv_length(ctx));
-	memcpy(ctx->iv, ctx->oiv, EVP_CIPHER_CTX_iv_length(ctx));
-	return 1;
-	}	
-#endif  /* def USE_SSL */
-
 /* Initializes EVP_CIPHER_CTX with default values */
 int gost_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 	const unsigned char *iv, int enc)
@@ -278,7 +214,6 @@ static void gost_crypt_mesh (void *ctx,unsigned char *iv,unsigned char *buf)
 	c->count+=8;
 	}
 
-#ifdef USE_SSL
 static void gost_cnt_next (void *ctx, unsigned char *iv, unsigned char *buf)
 	{
 	struct ossl_gost_cipher_ctx *c = ctx;
@@ -298,27 +233,32 @@ static void gost_cnt_next (void *ctx, unsigned char *iv, unsigned char *buf)
 		}	
 	g = buf1[0]|(buf1[1]<<8)|(buf1[2]<<16)|(buf1[3]<<24);
 	g += 0x01010101;
-	buf1[0]=g&0xff; buf1[1]=(g>>8)&0xff; buf1[2]=(g>>16)&0xff; buf1[3]=(g>>24)&0xff;
+	buf1[0]=(unsigned char)(g&0xff);
+	buf1[1]=(unsigned char)((g>>8)&0xff);
+	buf1[2]=(unsigned char)((g>>16)&0xff);
+	buf1[3]=(unsigned char)((g>>24)&0xff);
 	g = buf1[4]|(buf1[5]<<8)|(buf1[6]<<16)|(buf1[7]<<24);
 	go = g;
 	g += 0x01010104;
 	if (go > g)      /*  overflow*/
 		g++;
-	buf1[4]=g&0xff; buf1[5]=(g>>8)&0xff; buf1[6]=(g>>16)&0xff; buf1[7]=(g>>24)&0xff;
+	buf1[4]=(unsigned char)(g&0xff);
+	buf1[5]=(unsigned char)((g>>8)&0xff);
+	buf1[6]=(unsigned char)((g>>16)&0xff);
+	buf1[7]=(unsigned char)((g>>24)&0xff);
 	memcpy(iv,buf1,8);
 	gostcrypt(&(c->cctx),buf1,buf);
 	c->count +=8;
 	}
-#endif  /* def USE_SSL */
 
 /* GOST encryption in CFB mode */
 int	gost_cipher_do_cfb(EVP_CIPHER_CTX *ctx, unsigned char *out,
-	const unsigned char *in, unsigned int inl)
+	const unsigned char *in, size_t inl)
 	{
 	const unsigned char *in_ptr=in;
 	unsigned char *out_ptr=out;
-	int i=0;
-	int j=0;
+	size_t i=0;
+	size_t j=0;
 /* process partial block if any */
 	if (ctx->num) 
 		{
@@ -374,14 +314,13 @@ int	gost_cipher_do_cfb(EVP_CIPHER_CTX *ctx, unsigned char *out,
 	return 1;
 	}
 
-#if USE_SSL
 static int gost_cipher_do_cnt(EVP_CIPHER_CTX *ctx, unsigned char *out,
-	const unsigned char *in, unsigned int inl)
+	const unsigned char *in, size_t inl)
 	{
 	const unsigned char *in_ptr=in;
 	unsigned char *out_ptr=out;
-	int i=0;
-	int j;
+	size_t i=0;
+	size_t j;
 /* process partial block if any */
 	if (ctx->num) 
 		{
@@ -428,7 +367,6 @@ static int gost_cipher_do_cnt(EVP_CIPHER_CTX *ctx, unsigned char *out,
 		}	
 	return 1;
 	}
-#endif  /* def USE_SSL */
 
 /* Cleaning up of EVP_CIPHER_CTX */
 int gost_cipher_cleanup(EVP_CIPHER_CTX *ctx) 
@@ -543,28 +481,21 @@ int  gost89_get_asn1_parameters(EVP_CIPHER_CTX *ctx,ASN1_TYPE *params)
 	return 1;
 	}
 
-#ifdef USE_SSL
-
-int gost_imit_init_vizir(EVP_MD_CTX *ctx)
-	{
-	struct ossl_gost_imit_ctx *c = ctx->md_data;
-	memset(c,0,sizeof(struct ossl_gost_imit_ctx));
-	gost_init(&(c->cctx),&GostR3411_94_CryptoProParamSet);
-	return 1;
-	}
 
 int gost_imit_init_cpa(EVP_MD_CTX *ctx)
 	{
 	struct ossl_gost_imit_ctx *c = ctx->md_data;
-	memset(c,0,sizeof(struct ossl_gost_imit_ctx));
+	memset(c->buffer,0,16);
+	c->count = 0;
+	c->bytes_left=0;
 	c->key_meshing=1;
 	gost_init(&(c->cctx),&Gost28147_CryptoProParamSetA);
 	return 1;
 	}
 
-static void mac_block_mesh(struct ossl_gost_imit_ctx *c,unsigned char *data)
+static void mac_block_mesh(struct ossl_gost_imit_ctx *c,const unsigned char *data)
 	{
-	char buffer[8];
+	unsigned char buffer[8];
 	/* We are using local buffer for iv because CryptoPro doesn't 
 	 * interpret internal state of MAC algorithm as iv during keymeshing
 	 * (but does initialize internal state from iv in key transport
@@ -582,7 +513,10 @@ int gost_imit_update(EVP_MD_CTX *ctx, const void *data, size_t count)
 	struct ossl_gost_imit_ctx *c = ctx->md_data;
 	const unsigned char *p = data;
 	size_t bytes = count,i;
-	if (!(c->key_set)) return 0;
+	if (!(c->key_set)) {
+		GOSTerr(GOST_F_GOST_IMIT_UPDATE, GOST_R_MAC_KEY_NOT_SET);
+		return 0;
+	}
 	if (c->bytes_left)
 		{
 		for (i=c->bytes_left;i<8&&bytes>0;bytes--,i++,p++)
@@ -608,14 +542,15 @@ int gost_imit_update(EVP_MD_CTX *ctx, const void *data, size_t count)
 	if (bytes>0)
 		{
 		memcpy(c->partial_block,p,bytes);
-		c->bytes_left=bytes;
 		}	
+	c->bytes_left=bytes;
 	return 1;
 	}
 
 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->bytes_left)
 		{
 		int i;
@@ -633,13 +568,19 @@ int gost_imit_ctrl(EVP_MD_CTX *ctx,int type, int arg, void *ptr)
 	{
 	switch (type)
 		{
-		case EVP_MD_CTRL_GET_TLS_MAC_KEY_LENGTH:
+		case EVP_MD_CTRL_KEY_LEN:
 			*((unsigned int*)(ptr)) = 32;
 			return 1;
 		case EVP_MD_CTRL_SET_KEY:
 		{
+		if (arg!=32) {
+			GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_KEY_LENGTH);
+			return 0;
+		}
+
 		gost_key(&(((struct ossl_gost_imit_ctx*)(ctx->md_data))->cctx),ptr)	;
 		((struct ossl_gost_imit_ctx*)(ctx->md_data))->key_set = 1;
+		return 1;
 
 		}
 		default:
@@ -660,4 +601,3 @@ int gost_imit_cleanup(EVP_MD_CTX *ctx)
 	return 1;
 	}
 
-#endif