From 151e4d9bfaaaa520d5eb3547d676e6b209d2bd45 Mon Sep 17 00:00:00 2001 From: Alexander Chernyakhovsky Date: Tue, 15 Oct 2013 16:03:11 -0400 Subject: [PATCH] [ocsp] Handle OCSP responses that don't provide certificates Certificate authorities are not required to send the certificate used to sign the OCSP response if the response is signed by the original issuer. Modified-by: Michael Brown Signed-off-by: Michael Brown --- src/crypto/ocsp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/crypto/ocsp.c b/src/crypto/ocsp.c index 9c566888..27c0080c 100644 --- a/src/crypto/ocsp.c +++ b/src/crypto/ocsp.c @@ -867,12 +867,17 @@ static int ocsp_check_signature ( struct ocsp_check *ocsp, */ int ocsp_validate ( struct ocsp_check *ocsp, time_t time ) { struct ocsp_response *response = &ocsp->response; - struct x509_certificate *signer = response->signer; + struct x509_certificate *signer; int rc; /* Sanity checks */ assert ( response->data != NULL ); - assert ( signer != NULL ); + + /* The response may include a signer certificate; if this is + * not present then the response must have been signed + * directly by the issuer. + */ + signer = ( response->signer ? response->signer : ocsp->issuer ); /* Validate signer, if applicable. If the signer is not the * issuer, then it must be signed directly by the issuer.