summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWan-Teh Chang <wtc@google.com>2014-01-03 14:36:21 -0800
committerWan-Teh Chang <wtc@google.com>2014-01-03 14:36:21 -0800
commit69aa5db980ebdb77906a3e60ae0bab602a309b7e (patch)
treeb510ebd6448b2c2cb8d2ffced4b16fbc41ba4b74
parent175bf9d1e646fb0e156df8e153f78ecf19e99607 (diff)
downloadnss-hg-69aa5db980ebdb77906a3e60ae0bab602a309b7e.tar.gz
Bug 950299: ocsp_CertIDsMatch should return PR_FALSE instead of SECFailure
on error. Remove the unused parameter |handle|. r=ryan.sleevi.
-rw-r--r--lib/certhigh/ocsp.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/certhigh/ocsp.c b/lib/certhigh/ocsp.c
index d9c32890d..2e3c7559c 100644
--- a/lib/certhigh/ocsp.c
+++ b/lib/certhigh/ocsp.c
@@ -4227,8 +4227,7 @@ finish:
* algorithm was used.
*/
static PRBool
-ocsp_CertIDsMatch(CERTCertDBHandle *handle,
- CERTOCSPCertID *requestCertID,
+ocsp_CertIDsMatch(CERTOCSPCertID *requestCertID,
CERTOCSPCertID *responseCertID)
{
PRBool match = PR_FALSE;
@@ -4285,7 +4284,7 @@ ocsp_CertIDsMatch(CERTCertDBHandle *handle,
break;
default:
PORT_SetError(SEC_ERROR_INVALID_ALGORITHM);
- return SECFailure;
+ return PR_FALSE;
}
if ((keyHash != NULL)
@@ -4319,7 +4318,7 @@ ocsp_GetSingleResponseForCertID(CERTOCSPSingleResponse **responses,
for (i = 0; responses[i] != NULL; i++) {
single = responses[i];
- if (ocsp_CertIDsMatch(handle, certID, single->certID)) {
+ if (ocsp_CertIDsMatch(certID, single->certID)) {
return single;
}
}