Fix key generation worker shutdown.

Author: dgarske

examples/test_config.c

@@ -42,7 +42,7 @@ int etsi_client_connect(const char* urlStr)
                 ETSI_TEST_CLIENT_CERT, WOLFSSL_FILETYPE_PEM);
 
             if (urlStr) {
-                strncpy(urlStrCopy, urlStr, HTTP_MAX_URI-1);
+                strncpy(urlStrCopy, urlStr, (HTTP_MAX_URI - 1));
                 memset(&url, 0, sizeof(url));
                 wolfHttpUrlDecode(&url, urlStrCopy);
             }

src/svc_etsi.c

@@ -51,6 +51,8 @@ typedef struct EtsiSvcCtx {
 #ifdef WOLFKM_VAULT
     wolfVaultCtx*   vault; /* key vault */
 #endif
+
+    byte shutdown:1; /* signal to shutdown workers */
 } EtsiSvcCtx;
 static EtsiSvcCtx gSvcCtx;
 
@@ -130,6 +132,14 @@ static int EtsiSvcGenNewKey(EtsiSvcCtx* svcCtx, EtsiKeyType keyType, EtsiKey* ke
     return ret;
 }
 
+static void WakeKeyGenWorker(EtsiSvcCtx* svcCtx)
+{
+    /* signal key generation thread to wake */
+    pthread_mutex_lock(&svcCtx->kgMutex);
+    pthread_cond_signal(&svcCtx->kgCond);
+    pthread_mutex_unlock(&svcCtx->kgMutex);
+}
+
 static int SetupKeyPackage(SvcConn* conn, EtsiSvcCtx* svcCtx)
 {
     int ret = 0, i;
@@ -222,9 +232,7 @@ static int SetupKeyPackage(SvcConn* conn, EtsiSvcCtx* svcCtx)
 
     if (wakeKg) {
         /* signal key generation thread to wake */
-        pthread_mutex_lock(&svcCtx->kgMutex);
-        pthread_cond_signal(&svcCtx->kgCond);
-        pthread_mutex_unlock(&svcCtx->kgMutex);
+        WakeKeyGenWorker(svcCtx);
     }
 
     return ret;
@@ -318,7 +326,7 @@ static void* KeyPushWorker(void* arg)
         pthread_mutex_unlock(&svcCtx->kgMutex);
 
         XLOG(WOLFKM_LOG_DEBUG, "Key Generation Worker Wake %d sec\n", ret);
-    } while (1);
+    } while (!svcCtx->shutdown);
 
     return NULL;
 }
@@ -581,6 +589,10 @@ void wolfEtsiSvc_Cleanup(SvcInfo* svc)
 
         wc_FreeRng(&svcCtx->rng);
 
+        /* signal shutdown and wake worker */
+        svcCtx->shutdown =  1;
+        WakeKeyGenWorker(svcCtx);
+
         pthread_mutex_destroy(&svcCtx->kgMutex);
         pthread_cond_destroy(&svcCtx->kgCond);