Using int for the digest length in EVP_DigestFinal() broke some compilers.
Changed to unsigned int: also need an evil cast in pk7_doit.c because a signed, unsigned comparison chokes VC++.
This commit is contained in:
parent
199d59e5a1
commit
0b415fb0ed
2 changed files with 3 additions and 3 deletions
|
@ -721,7 +721,7 @@ PKCS7_SIGNER_INFO *si;
|
|||
if ((sk != NULL) && (sk_num(sk) != 0))
|
||||
{
|
||||
unsigned char md_dat[EVP_MAX_MD_SIZE];
|
||||
int md_len;
|
||||
unsigned int md_len;
|
||||
ASN1_OCTET_STRING *message_digest;
|
||||
|
||||
EVP_DigestFinal(&mdc_tmp,md_dat,&md_len);
|
||||
|
@ -731,7 +731,7 @@ PKCS7_SIGNER_INFO *si;
|
|||
PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
|
||||
goto err;
|
||||
}
|
||||
if ((message_digest->length != md_len) ||
|
||||
if ((message_digest->length != (int)md_len) ||
|
||||
(memcmp(message_digest->data,md_dat,md_len)))
|
||||
{
|
||||
#if 0
|
||||
|
|
|
@ -124,7 +124,7 @@ char *str;
|
|||
ASN1_BIT_STRING *pk;
|
||||
unsigned char pkey_dig[EVP_MAX_MD_SIZE];
|
||||
EVP_MD_CTX md;
|
||||
int diglen;
|
||||
unsigned int diglen;
|
||||
|
||||
if(strcmp(str, "hash")) return s2i_ASN1_OCTET_STRING(method, ctx, str);
|
||||
|
||||
|
|
Loading…
Reference in a new issue