lib/extensions/openssl.so/ext/sources/crypto/ocsp/ocsp_vfy.c in rhodes-3.5.1.12 vs lib/extensions/openssl.so/ext/sources/crypto/ocsp/ocsp_vfy.c in rhodes-5.5.0

@@ -89,14 +89,17 @@
 		flags |= OCSP_NOVERIFY;
 	if (!(flags & OCSP_NOSIGS))
 		{
 		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;
 			}
 		}
 	if (!(flags & OCSP_NOVERIFY))
@@ -106,9 +109,10 @@
 			init_res = X509_STORE_CTX_init(&ctx, st, signer, NULL);
 		else
 			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;
 			}
 
 		X509_STORE_CTX_set_purpose(&ctx, X509_PURPOSE_OCSP_HELPER);