X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=engines%2Fccgost%2Fgost89.c;h=7ebae0f71f82a009b53842e785a9da1efe188c35;hp=c44143dca7a81bae2f6935f3d4f78ad1eca160bf;hb=b50842036f9910fb4b63096d0cce828cc368cbd2;hpb=84948b39dfada6628ab65743fad64cf4714a0a92

diff --git a/engines/ccgost/gost89.c b/engines/ccgost/gost89.c
index c44143dca7..7ebae0f71f 100644
--- a/engines/ccgost/gost89.c
+++ b/engines/ccgost/gost89.c
@@ -164,8 +164,10 @@ void gostcrypt(gost_ctx *c, const byte *in, byte *out)
 	n2 ^= f(c,n1+c->k[3]); n1 ^= f(c,n2+c->k[2]);
 	n2 ^= f(c,n1+c->k[1]); n1 ^= f(c,n2+c->k[0]);
  
-	out[0] = (n2&0xff);  out[1] = (n2>>8)&0xff; out[2]=(n2>>16)&0xff; out[3]=n2>>24; 
-	out[4] = (n1&0xff);  out[5] = (n1>>8)&0xff; out[6]=(n1>>16)&0xff; out[7]=n1>>24;
+	out[0] = (byte)(n2&0xff);  out[1] = (byte)((n2>>8)&0xff);
+	out[2] = (byte)((n2>>16)&0xff); out[3]=(byte)(n2>>24); 
+	out[4] = (byte)(n1&0xff);  out[5] = (byte)((n1>>8)&0xff);
+	out[6] = (byte)((n1>>16)&0xff); out[7] = (byte)(n1>>24);
 	} 
 /* Low-level decryption routine. Decrypts one 64-bit block */
 void gostdecrypt(gost_ctx *c, const byte *in,byte *out)
@@ -193,8 +195,11 @@ void gostdecrypt(gost_ctx *c, const byte *in,byte *out)
 	n2 ^= f(c,n1+c->k[5]); n1 ^= f(c,n2+c->k[4]);
 	n2 ^= f(c,n1+c->k[3]); n1 ^= f(c,n2+c->k[2]);
 	n2 ^= f(c,n1+c->k[1]); n1 ^= f(c,n2+c->k[0]);
-	out[0] = (n2&0xff);  out[1] = (n2>>8)&0xff; out[2]=(n2>>16)&0xff; out[3]=n2>>24;
-	out[4] = (n1&0xff);  out[5] = (n1>>8)&0xff; out[6]=(n1>>16)&0xff; out[7]=n1>>24;
+
+	out[0] = (byte)(n2&0xff);  out[1] = (byte)((n2>>8)&0xff);
+	out[2] = (byte)((n2>>16)&0xff); out[3]=(byte)(n2>>24);
+	out[4] = (byte)(n1&0xff);  out[5] = (byte)((n1>>8)&0xff);
+	out[6] = (byte)((n1>>16)&0xff); out[7] = (byte)(n1>>24);
 	} 
 
 /* Encrypts several blocks in ECB mode */
@@ -280,10 +285,10 @@ void gost_get_key(gost_ctx *c, byte *k)
 	int i,j; 
 	for(i=0,j=0;i<8;i++,j+=4)
 		{
-		k[j]=c->k[i]& 0xFF;
-		k[j+1]=(c->k[i]>>8 )&0xFF;
-		k[j+2]=(c->k[i]>>16) &0xFF;
-		k[j+3]=(c->k[i]>>24) &0xFF;
+		k[j]=(byte)(c->k[i]& 0xFF);
+		k[j+1]=(byte)((c->k[i]>>8 )&0xFF);
+		k[j+2]=(byte)((c->k[i]>>16) &0xFF);
+		k[j+3]=(byte)((c->k[i]>>24) &0xFF);
 		}		
 	}
 
@@ -332,8 +337,10 @@ void mac_block(gost_ctx *c,byte *buffer,const  byte *block)
 	n2 ^= f(c,n1+c->k[4]); n1 ^= f(c,n2+c->k[5]);
 	n2 ^= f(c,n1+c->k[6]); n1 ^= f(c,n2+c->k[7]);
 
-	buffer[0] = (n1&0xff);  buffer[1] = (n1>>8)&0xff; buffer[2]=(n1>>16)&0xff; buffer[3]=n1>>24;
-	buffer[4] = (n2&0xff);  buffer[5] = (n2>>8)&0xff; buffer[6]=(n2>>16)&0xff; buffer[7]=n2>>24;
+	buffer[0] = (byte)(n1&0xff);  buffer[1] = (byte)((n1>>8)&0xff);
+	buffer[2] = (byte)((n1>>16)&0xff); buffer[3] = (byte)(n1>>24);
+	buffer[4] = (byte)(n2&0xff);  buffer[5] = (byte)((n2>>8)&0xff);
+	buffer[6] = (byte)((n2>>16)&0xff); buffer[7] = (byte)(n2>>24);
 	}
 
 /* Get mac with specified number of bits from MAC state buffer */
@@ -354,7 +361,7 @@ int gost_mac(gost_ctx *ctx,int mac_len,const unsigned char *data,
 	{
 	byte buffer[8]={0,0,0,0,0,0,0,0};
 	byte buf2[8];
-	int i;
+	unsigned int i;
 	for (i=0;i+8<=data_len;i+=8) 
 		mac_block(ctx,buffer,data+i);
 	if (i<data_len)
@@ -373,7 +380,7 @@ int gost_mac_iv(gost_ctx *ctx,int mac_len,const unsigned char *iv,const unsigned
 	{
 	byte buffer[8];
 	byte buf2[8];
-	int i;
+	unsigned int i;
 	memcpy (buffer,iv,8);
 	for (i=0;i+8<=data_len;i+=8) 
 		mac_block(ctx,buffer,data+i);