fixup! CMP: add support for genm with crlStatusList and genp with crls

siemens · Mar 14, 2024 · 2b55a72 · 2b55a72
1 parent f3d05f8
commit 2b55a72
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -77,7 +77,9 @@ OpenSSL 3.3
 
  * Added support for requesting CRL in CMP.
 
-    *Rajeev Ranjan, Siemens AG*
+   This work was sponsored by Siemens AG.
+
+    *Rajeev Ranjan*
 
  * Added `-set_issuer` and `-set_subject` options to `openssl x509` to
    override the Issuer and Subject when creating a certificate. The `-subj`

diff --git a/apps/lib/cmp_mock_srv.c b/apps/lib/cmp_mock_srv.c
@@ -413,8 +413,8 @@ static int check_client_crl(const STACK_OF(OSSL_CMP_CRLSTATUS) *crlStatusList,
                             const X509_CRL *crl)
 {
     OSSL_CMP_CRLSTATUS *crlstatus;
-    DIST_POINT_NAME *dpn;
-    GENERAL_NAMES *issuer;
+    DIST_POINT_NAME *dpn = NULL;
+    GENERAL_NAMES *issuer = NULL;
     ASN1_TIME *thisupd = NULL;
 
     if (sk_OSSL_CMP_CRLSTATUS_num(crlStatusList) != 1) {
@@ -464,7 +464,7 @@ static OSSL_CMP_ITAV *process_genm_itav(mock_srv_ctx *ctx, int req_nid,
         break;
     case NID_id_it_crlStatusList:
         {
-            STACK_OF(OSSL_CMP_CRLSTATUS) *crlstatuslist;
+            STACK_OF(OSSL_CMP_CRLSTATUS) *crlstatuslist = NULL;
             int res = 0;
 
             if (!OSSL_CMP_ITAV_get0_crlStatusList(req, &crlstatuslist))

diff --git a/crypto/cmp/cmp_genm.c b/crypto/cmp/cmp_genm.c
@@ -352,7 +352,7 @@ int OSSL_CMP_get1_crlUpdate(OSSL_CMP_CTX *ctx, const X509 *crlcert,
     OSSL_CMP_CRLSTATUS *status = NULL;
     STACK_OF(OSSL_CMP_CRLSTATUS) *list = NULL;
     OSSL_CMP_ITAV *req = NULL, *itav = NULL;
-    STACK_OF(X509_CRL) *crls;
+    STACK_OF(X509_CRL) *crls = NULL;
     int res = 0;
 
     if (crl == NULL) {

diff --git a/crypto/x509/v3_genn.c b/crypto/x509/v3_genn.c
@@ -62,7 +62,7 @@ int GENERAL_NAME_set1_X509_NAME(GENERAL_NAME **tgt, const X509_NAME *src)
 {
     GENERAL_NAME *name;
 
-    if (tgt == NULL){
+    if (tgt == NULL) {
         ERR_raise(ERR_LIB_X509V3, X509V3_R_INVALID_NULL_ARGUMENT);
         return 0;
     }