mirror of
https://abf.rosa.ru/djam/openssl.git
synced 2025-02-23 16:22:50 +00:00
42 lines
1 KiB
Diff
42 lines
1 KiB
Diff
|
diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c
|
||
|
|
index cecdb13..097ec81 100644
|
||
|
|
--- a/crypto/asn1/a_verify.c
|
||
|
|
+++ b/crypto/asn1/a_verify.c
|
||
|
|
@@ -136,6 +136,12 @@ int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a, ASN1_BIT_STRING *signat
|
||
|
|
|
||
|
|
int mdnid, pknid;
|
||
|
|
|
||
|
|
+ if (!pkey)
|
||
|
|
+ {
|
||
|
|
+ ASN1err(ASN1_F_ASN1_ITEM_VERIFY, ERR_R_PASSED_NULL_PARAMETER);
|
||
|
|
+ return -1;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
EVP_MD_CTX_init(&ctx);
|
||
|
|
|
||
|
|
/* Convert signature OID into digest and public key OIDs */
|
||
|
|
diff --git a/crypto/ocsp/ocsp_vfy.c b/crypto/ocsp/ocsp_vfy.c
|
||
|
|
index 8a5e788..2767183 100644
|
||
|
|
--- a/crypto/ocsp/ocsp_vfy.c
|
||
|
|
+++ b/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;
|
||
|
|
--
|
||
|
|
1.7.9.5
|
||
|
|
|
||
|
|
|