remove redundant ERR_raise
authorx2018 <xkernel.wang@foxmail.com>
Wed, 1 Dec 2021 08:15:44 +0000 (16:15 +0800)
committerPauli <ppzgs1@gmail.com>
Fri, 10 Dec 2021 04:20:29 +0000 (15:20 +1100)
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17175)

crypto/cmp/cmp_vfy.c
crypto/x509/t_x509.c

index d9fd23425b559e3f74f00fe7da595a84e73f919c..cdfad0a6317cf5b1b675835c05c23929b60050e6 100644 (file)
@@ -34,10 +34,8 @@ static int verify_signature(const OSSL_CMP_CTX *cmp_ctx,
         return 0;
 
     bio = BIO_new(BIO_s_mem()); /* may be NULL */
-    if (bio == NULL) {
-        ERR_raise(ERR_LIB_CMP, ERR_R_MALLOC_FAILURE);
+    if (bio == NULL)
         return 0;
-    }
     /* verify that keyUsage, if present, contains digitalSignature */
     if (!cmp_ctx->ignore_keyusage
             && (X509_get_key_usage(cert) & X509v3_KU_DIGITAL_SIGNATURE) == 0) {
index ae39b0f231a1a8ec5e7c4924226de81bb7fa4bbd..13ccb35508a5f9139ef888039c8bb4512951009f 100644 (file)
@@ -470,10 +470,8 @@ int X509_STORE_CTX_print_verify_cb(int ok, X509_STORE_CTX *ctx)
         int cert_error = X509_STORE_CTX_get_error(ctx);
         BIO *bio = BIO_new(BIO_s_mem()); /* may be NULL */
 
-        if (bio == NULL) {
-            ERR_raise(ERR_LIB_X509, ERR_R_MALLOC_FAILURE);
+        if (bio == NULL)
             return 0;
-        }
         BIO_printf(bio, "%s at depth = %d error = %d (%s)\n",
                    X509_STORE_CTX_get0_parent_ctx(ctx) != NULL
                    ? "CRL path validation"