fix for memory leak and windows build issues

Author: JacobBarthelmeh

src/ssh.c

@@ -2513,7 +2513,7 @@ int wolfSSH_CTX_UsePrivateKey_fromStore(WOLFSSH_CTX* ctx,
     heap = ctx->heap;
 
     /* Open the certificate store */
-    hStore = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, NULL,
+    hStore = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, (HCRYPTPROV_LEGACY)0,
             dwFlags | CERT_STORE_OPEN_EXISTING_FLAG, storeName);
     if (hStore == NULL) {
         DWORD dwErr = GetLastError();
@@ -2639,7 +2639,7 @@ int wolfSSH_CTX_UsePrivateKey_fromStore(WOLFSSH_CTX* ctx,
     /* Set up the private key structure */
     ctx->privateKey[keyIdx].publicKeyFmt = keyId;
     ctx->privateKey[keyIdx].useCertStore = 1;
-    ctx->privateKey[keyIdx].certStoreContext = pCertContext;
+    ctx->privateKey[keyIdx].certStoreContext = (void*)pCertContext;
 
     /* Store the store name and subject name */
     {
@@ -2657,8 +2657,8 @@ int wolfSSH_CTX_UsePrivateKey_fromStore(WOLFSSH_CTX* ctx,
             return WS_MEMORY_E;
         }
 
-        wcscpy(storeNameCopy, storeName);
-        wcscpy(subjectNameCopy, subjectName);
+        WMEMCPY(storeNameCopy, storeName, storeNameLen * sizeof(wchar_t));
+        WMEMCPY(subjectNameCopy, subjectName, subjectNameLen * sizeof(wchar_t));
         ctx->privateKey[keyIdx].storeName = storeNameCopy;
         ctx->privateKey[keyIdx].subjectName = subjectNameCopy;
         ctx->privateKey[keyIdx].dwFlags = dwFlags;
@@ -2703,6 +2703,7 @@ int wolfSSH_CTX_UsePrivateKey_fromStore(WOLFSSH_CTX* ctx,
             WFREE((void*)ctx->privateKey[keyIdx].subjectName, heap, DYNTYPE_STRING);
             WFREE(ctx->privateKey[keyIdx].cert, heap, DYNTYPE_CERT);
             ctx->privateKey[keyIdx].useCertStore = 0;
+            CertFreeCertificateContext(pCertContext);
             ctx->privateKey[keyIdx].certStoreContext = NULL;
             ctx->privateKey[keyIdx].storeName = NULL;
             ctx->privateKey[keyIdx].subjectName = NULL;

wolfssh/internal.h

@@ -1009,8 +1009,6 @@ WOLFSSH_LOCAL void ChannelDelete(WOLFSSH_CHANNEL*, void*);
 WOLFSSH_LOCAL WOLFSSH_CHANNEL* ChannelFind(WOLFSSH*, word32, byte);
 WOLFSSH_LOCAL int ChannelRemove(WOLFSSH*, word32, byte);
 WOLFSSH_LOCAL int ChannelPutData(WOLFSSH_CHANNEL*, byte*, word32);
-WOLFSSH_LOCAL int IdentifyAsn1Key(const byte* in, word32 inSz,
-        int isPrivate, void* heap);
 WOLFSSH_LOCAL int IdentifyOpenSshKey(const byte* in, word32 inSz, void* heap);
 WOLFSSH_LOCAL void RefreshPublicKeyAlgo(WOLFSSH_CTX* ctx);
 WOLFSSH_LOCAL int wolfSSH_ProcessBuffer(WOLFSSH_CTX*,