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

Reduce casting nastiness.

Browse Source
This commit is contained in:
Ben Laurie
2014-07-05 14:54:02 +01:00
parent 7f6e957864
commit 6835f572a9
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/evp/e_aes_cbc_hmac_sha256.c
View File

@@ -704,6 +704,7 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
static int aesni_cbc_hmac_sha256_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr) static int aesni_cbc_hmac_sha256_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
{ {
EVP_AES_HMAC_SHA256 *key = data(ctx); EVP_AES_HMAC_SHA256 *key = data(ctx);
unsigned int u_arg = (unsigned int)arg;
switch (type) switch (type)
{ {
@@ -714,7 +715,10 @@ static int aesni_cbc_hmac_sha256_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, vo
memset (hmac_key,0,sizeof(hmac_key)); memset (hmac_key,0,sizeof(hmac_key));
if (arg > (int)sizeof(hmac_key)) { if (arg < 0)
return -1;
if (u_arg > sizeof(hmac_key)) {
SHA256_Init(&key->head); SHA256_Init(&key->head);
SHA256_Update(&key->head,ptr,arg); SHA256_Update(&key->head,ptr,arg);
SHA256_Final(hmac_key,&key->head); SHA256_Final(hmac_key,&key->head);
@@ -774,7 +778,10 @@ static int aesni_cbc_hmac_sha256_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, vo
unsigned int n4x=1, x4; unsigned int n4x=1, x4;
unsigned int frag, last, packlen, inp_len; unsigned int frag, last, packlen, inp_len;
if (arg<(int)sizeof(EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM)) return -1; if (arg < 0)
return -1;
if (u_arg < sizeof(EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM)) return -1;
inp_len = param->inp[11]<<8|param->inp[12]; inp_len = param->inp[11]<<8|param->inp[12];