summaryrefslogtreecommitdiff
path: root/Cryptlib/OpenSSL/crypto/ocsp/ocsp_vfy.c
diff options
context:
space:
mode:
authorMathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>2015-05-06 09:50:11 -0400
committerMathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>2015-05-06 09:50:11 -0400
commit4c03444e7c971185c20fa102eb09b707aea0d4d4 (patch)
treec8402158f0090f45bb46b9b539d981633e509f9a /Cryptlib/OpenSSL/crypto/ocsp/ocsp_vfy.c
parent2283f5e85dbc78dd10810cb6ebfa39e61ab6759e (diff)
parenta14921c5944c340056312f2f5b1728d698f628b1 (diff)
downloadefi-boot-shim-4c03444e7c971185c20fa102eb09b707aea0d4d4.tar.gz
efi-boot-shim-4c03444e7c971185c20fa102eb09b707aea0d4d4.zip
New upstream release.
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/ocsp/ocsp_vfy.c')
-rw-r--r--[-rwxr-xr-x]Cryptlib/OpenSSL/crypto/ocsp/ocsp_vfy.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/Cryptlib/OpenSSL/crypto/ocsp/ocsp_vfy.c b/Cryptlib/OpenSSL/crypto/ocsp/ocsp_vfy.c
index 4a0c3870..f24080fa 100755..100644
--- a/Cryptlib/OpenSSL/crypto/ocsp/ocsp_vfy.c
+++ b/Cryptlib/OpenSSL/crypto/ocsp/ocsp_vfy.c
@@ -91,9 +91,12 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
{
EVP_PKEY *skey;
skey = X509_get_pubkey(signer);
- ret = OCSP_BASICRESP_verify(bs, skey, 0);
- EVP_PKEY_free(skey);
- if(ret <= 0)
+ if (skey)
+ {
+ ret = OCSP_BASICRESP_verify(bs, skey, 0);
+ EVP_PKEY_free(skey);
+ }
+ if(!skey || ret <= 0)
{
OCSPerr(OCSP_F_OCSP_BASIC_VERIFY, OCSP_R_SIGNATURE_FAILURE);
goto end;
@@ -108,6 +111,7 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
init_res = X509_STORE_CTX_init(&ctx, st, signer, bs->certs);
if(!init_res)
{
+ ret = -1;
OCSPerr(OCSP_F_OCSP_BASIC_VERIFY,ERR_R_X509_LIB);
goto end;
}