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

Fixed error introduced in commit f2be92b94dad3c6cbdf79d99a324804094cf1617

Browse Source 
that fixed PR#3450 where an existing cast masked an issue when i was changed
from int to long in that commit

Picked up on z/linux (s390) where sizeof(int)!=sizeof(long)

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit b5ff559ff90124c6fd53bbb49dae5edb4e821e0a)
This commit is contained in:
Tim Hudson 2014-09-21 21:54:31 +10:00
parent dfb5de6fc0
commit 320d949781
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ssl/s3_clnt.c
View File

@ -1979,6 +1979,7 @@ fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));
if (pkey->type == EVP_PKEY_RSA && !SSL_USE_SIGALGS(s)) if (pkey->type == EVP_PKEY_RSA && !SSL_USE_SIGALGS(s))
{ {
int num; int num;
unsigned int size;
j=0; j=0;
q=md_buf; q=md_buf;
@ -1991,9 +1992,9 @@ fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));
EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE); EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
EVP_DigestUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE); EVP_DigestUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
EVP_DigestUpdate(&md_ctx,param,param_len); EVP_DigestUpdate(&md_ctx,param,param_len);
EVP_DigestFinal_ex(&md_ctx,q,(unsigned int *)&i); EVP_DigestFinal_ex(&md_ctx,q,&size);
q+=i; q+=size;
j+=i; j+=size;
} }
i=RSA_verify(NID_md5_sha1, md_buf, j, p, n, i=RSA_verify(NID_md5_sha1, md_buf, j, p, n,
pkey->pkey.rsa); pkey->pkey.rsa);