Merge pull request #519 from openziti/fix-enrollment-crash

check if key supports certificate store
openziti · May 23, 2023 · 2fc3556 · 2fc3556
2 parents 3d8836b + f72b6f5
commit 2fc3556
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
@@ -8,7 +8,7 @@ else ()
 
     FetchContent_Declare(tlsuv
             GIT_REPOSITORY https://github.com/openziti/tlsuv.git
-            GIT_TAG v0.23.4
+            GIT_TAG v0.23.5
             )
     FetchContent_MakeAvailable(tlsuv)
 

diff --git a/library/ziti_enroll.c b/library/ziti_enroll.c
@@ -248,6 +248,7 @@ static void enroll_cb(ziti_enrollment_resp *er, const ziti_error *err, void *enr
 
         tls_cert c = NULL;
         if (enroll_req->ecfg->tls->api->load_cert(&c, er->cert, strlen(er->cert)) == 0 &&
+            enroll_req->ecfg->pk->store_certificate != NULL &&
             enroll_req->ecfg->pk->store_certificate(enroll_req->ecfg->pk, c) == 0) {
             ZITI_LOG(INFO, "stored certificate to PKCS#11 token");
         }