projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Whitespace cleanup in crypto
[openssl.git]
/
crypto
/
pkcs7
/
pk7_doit.c
diff --git
a/crypto/pkcs7/pk7_doit.c
b/crypto/pkcs7/pk7_doit.c
index 1333e4df4d2d093091f3afad4406c320cd1a4748..bc6bd30fc3c8bbce752a5bd96e415c421a6cca66 100644
(file)
--- a/
crypto/pkcs7/pk7_doit.c
+++ b/
crypto/pkcs7/pk7_doit.c
@@
-582,7
+582,7
@@
BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
BIO_free_all(btmp);
BIO_free_all(etmp);
BIO_free_all(bio);
BIO_free_all(btmp);
BIO_free_all(etmp);
BIO_free_all(bio);
- return
NULL;
+ return NULL;
}
static BIO *PKCS7_find_digest(EVP_MD_CTX **pmd, BIO *bio, int nid)
}
static BIO *PKCS7_find_digest(EVP_MD_CTX **pmd, BIO *bio, int nid)
@@
-775,7
+775,8
@@
int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
goto err;
if (!EVP_DigestFinal_ex(mdc, md_data, &md_len))
goto err;
goto err;
if (!EVP_DigestFinal_ex(mdc, md_data, &md_len))
goto err;
- ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
+ if (!ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len))
+ goto err;
}
if (!PKCS7_is_detached(p7)) {
}
if (!PKCS7_is_detached(p7)) {