Attachment 120434 Details for Bug 16770 – Improve robustness of SignatureHandler::validateCertificate

[patch] Improve robustness of SignatureHandler::validateCertificate

signature_handler.diff (text/plain), 1.91 KB, created by Andre Guerreiro on 2015-12-09 16:04:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andre Guerreiro

Created: 2015-12-09 16:04:01 UTC

Size: 1.91 KB

patch

obsolete

>diff --git a/poppler/SignatureHandler.cc b/poppler/SignatureHandler.cc
>index e5ad4f8..dbddcf9 100644
>--- a/poppler/SignatureHandler.cc
>+++ b/poppler/SignatureHandler.cc
>@@ -228,14 +228,15 @@ NSSCMSVerificationStatus SignatureHandler::validateSignature()
>   if ((NSS_CMSSignerInfo_GetSigningCertificate(CMSSignerInfo, CERT_GetDefaultCertDB())) == NULL)
>     CMSSignerInfo->verificationStatus = NSSCMSVS_SigningCertNotFound;
> 
>-  if (CMSSignedData->contentInfo.content.data != NULL)
>+  SECItem * content_info_data = CMSSignedData->contentInfo.content.data;
>+  if (content_info_data != NULL && content_info_data->data != NULL)
>   {
>     /*
>       This means it's not a detached type signature
>       so the digest is contained in SignedData->contentInfo
>     */
>-    if(memcmp(digest.data, CMSSignedData->contentInfo.content.data->data, hash_length) == 0
>-        && digest.len == CMSSignedData->contentInfo.content.data->len)
>+    if (memcmp(digest.data, content_info_data->data, hash_length) == 0
>+        && digest.len == content_info_data->len)
>     {
>       PORT_Free(digest_buffer);
>       return NSSCMSVS_GoodSignature;
>@@ -276,15 +277,10 @@ SECErrorCodes SignatureHandler::validateCertificate()
>   inParams[0].value.pointer.revocation = CERT_GetClassicOCSPEnabledSoftFailurePolicy();
>   inParams[1].type = cert_pi_end;
> 
>-  if (CERT_PKIXVerifyCert(cert, certificateUsageEmailSigner, inParams, NULL, 
>-                CMSSignerInfo->cmsg->pwfn_arg) != SECSuccess) {
>-    retVal = (SECErrorCodes) PORT_GetError();
>-  } else {
>-    // PORT_GetError() will return 0 if everything was fine, 
>-    // there are other possible outcomes even if the previous return was SECSuccess.
>-    retVal = (SECErrorCodes) PORT_GetError();
>-  }
>+  CERT_PKIXVerifyCert(cert, certificateUsageEmailSigner, inParams, NULL, 
>+                CMSSignerInfo->cmsg->pwfn_arg);
> 
>+  retVal = (SECErrorCodes) PORT_GetError();
> 
>   if (cert)
>     CERT_DestroyCertificate(cert);

Actions: View | Splinter Review

Attachments on bug 16770: 37425 | 66786 | 117885 | 118027 | 118036 | 118050 | 118193 | 118195 | 118398 | 118446 | 118449 | 118745 | 119174 | 119283 | 120434 | 120758 | 120760 | 120889 | 120924 | 120992

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.