[CRYPT32]

[reactos.git] / reactos / dll / win32 / crypt32 / rootstore.c

diff --git a/reactos/dll/win32/crypt32/rootstore.c b/reactos/dll/win32/crypt32/rootstore.c
index 70b5ef8..f3c8bba 100644 (file)
--- a/reactos/dll/win32/crypt32/rootstore.c
+++ b/reactos/dll/win32/crypt32/rootstore.c
@@ -15,9 +15,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#include "config.h"
-#include <stdarg.h>
-#include <stdio.h>
+
+#include "crypt32_private.h"
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
@@ -31,16 +31,7 @@
 #endif
 #include <errno.h>
 #include <limits.h>
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "windef.h"
-#include "winbase.h"
-#include "winreg.h"
-#include "wincrypt.h"
-#include "winternl.h"
-#include "wine/debug.h"
-#include "crypt32_private.h"
-#ifdef __APPLE__
+#ifdef HAVE_SECURITY_SECURITY_H
 #include <Security/Security.h>
 #endif
 
@@ -189,7 +180,7 @@ static const char *trust_status_to_str(DWORD status)
          "\n\tbad name constraints");
     if (status & CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT)
         pos += snprintf(buf + pos, sizeof(buf) - pos,
-         "\n\tunsuported name constraint");
+         "\n\tunsupported name constraint");
     if (status & CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT)
         pos += snprintf(buf + pos, sizeof(buf) - pos,
          "\n\tundefined name constraint");
@@ -245,7 +236,7 @@ static void check_and_store_certs(HCERTSTORE from, HCERTSTORE to)
     TRACE("\n");
 
     CertDuplicateStore(to);
-    engine = CRYPT_CreateChainEngine(to, &chainEngineConfig);
+    engine = CRYPT_CreateChainEngine(to, CERT_SYSTEM_STORE_CURRENT_USER, &chainEngineConfig);
     if (engine)
     {
         PCCERT_CONTEXT cert = NULL;
@@ -256,9 +247,10 @@ static void check_and_store_certs(HCERTSTORE from, HCERTSTORE to)
             {
                 CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } };
                 PCCERT_CHAIN_CONTEXT chain;
-                BOOL ret = CertGetCertificateChain(engine, cert, NULL, from,
-                 &chainPara, 0, NULL, &chain);
+                BOOL ret;
 
+                ret = CertGetCertificateChain(engine, cert, NULL, from,
+                 &chainPara, CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL, NULL, &chain);
                 if (!ret)
                     TRACE("rejecting %s: %s\n", get_cert_common_name(cert),
                      "chain creation failed");
@@ -326,6 +318,34 @@ static BOOL import_certs_from_file(int fd, HCERTSTORE store)
 static BOOL import_certs_from_path(LPCSTR path, HCERTSTORE store,
  BOOL allow_dir);
 
+#ifdef HAVE_READDIR
+static BOOL check_buffer_resize(char **ptr_buf, size_t *buf_size, size_t check_size)
+{
+    if (check_size > *buf_size)
+    {
+        *buf_size = check_size;
+
+        if (*ptr_buf)
+        {
+            char *realloc_buf = CryptMemRealloc(*ptr_buf, *buf_size);
+
+            if (!realloc_buf)
+                return FALSE;
+
+            *ptr_buf = realloc_buf;
+        }
+        else
+        {
+            *ptr_buf = CryptMemAlloc(*buf_size);
+            if (!*ptr_buf)
+                return FALSE;
+        }
+    }
+
+    return TRUE;
+}
+#endif
+
 /* Opens path, which must be a directory, and imports certificates from every
  * file in the directory into store.
  * Returns TRUE if any certificates were successfully imported.
@@ -341,23 +361,27 @@ static BOOL import_certs_from_dir(LPCSTR path, HCERTSTORE store)
     dir = opendir(path);
     if (dir)
     {
-        size_t bufsize = strlen(path) + 1 + PATH_MAX + 1;
-        char *filebuf = CryptMemAlloc(bufsize);
+        size_t path_len = strlen(path), bufsize = 0;
+        char *filebuf = NULL;
 
-        if (filebuf)
+        struct dirent *entry;
+        while ((entry = readdir(dir)))
         {
-            struct dirent *entry;
-            while ((entry = readdir(dir)))
+            if (strcmp(entry->d_name, ".") && strcmp(entry->d_name, ".."))
             {
-                if (strcmp(entry->d_name, ".") && strcmp(entry->d_name, ".."))
+                size_t name_len = strlen(entry->d_name);
+
+                if (!check_buffer_resize(&filebuf, &bufsize, path_len + 1 + name_len + 1))
                 {
-                    snprintf(filebuf, bufsize, "%s/%s", path, entry->d_name);
-                    if (import_certs_from_path(filebuf, store, FALSE) && !ret)
-                        ret = TRUE;
+                    ERR("Path buffer (re)allocation failed with out of memory condition\n");
+                    break;
                 }
+                snprintf(filebuf, bufsize, "%s/%s", path, entry->d_name);
+                if (import_certs_from_path(filebuf, store, FALSE) && !ret)
+                    ret = TRUE;
             }
-            CryptMemFree(filebuf);
         }
+        CryptMemFree(filebuf);
         closedir(dir);
     }
     return ret;
@@ -455,7 +479,9 @@ static const char * const CRYPT_knownLocations[] = {
  "/etc/ssl/certs/ca-certificates.crt",
  "/etc/ssl/certs",
  "/etc/pki/tls/certs/ca-bundle.crt",
+ "/usr/share/ca-certificates/ca-bundle.crt",
  "/usr/local/share/certs/",
+ "/etc/sfw/openssl/certs",
 };
 
 static const BYTE authenticode[] = {
@@ -716,7 +742,7 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store)
         DWORD i;
         BOOL ret = FALSE;
 
-#ifdef __APPLE__
+#ifdef HAVE_SECURITY_SECURITY_H
         OSStatus status;
         CFArrayRef rootCerts;
 
@@ -774,14 +800,26 @@ static HCERTSTORE create_root_store(void)
         read_trusted_roots_from_known_locations(memStore);
         add_ms_root_certs(memStore);
         root = CRYPT_ProvCreateStore(0, memStore, &provInfo);
+#ifdef __REACTOS__
+        {
+            HCERTSTORE regStore = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, CERT_SYSTEM_STORE_LOCAL_MACHINE, L"AuthRoot");
+            if (regStore)
+            {
+                HCERTSTORE collStore = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0,
+                    CERT_STORE_CREATE_NEW_FLAG, NULL);
+                CertAddStoreToCollection(collStore, regStore, 0, 0);
+                root = collStore;
+            }
+        }
+#endif
     }
     TRACE("returning %p\n", root);
     return root;
 }
 
-static PWINECRYPT_CERTSTORE CRYPT_rootStore;
+static WINECRYPT_CERTSTORE *CRYPT_rootStore;
 
-PWINECRYPT_CERTSTORE CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags)
+WINECRYPT_CERTSTORE *CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags)
 {
     TRACE("(%ld, %08x)\n", hCryptProv, dwFlags);
 
@@ -800,7 +838,7 @@ PWINECRYPT_CERTSTORE CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags)
         if (CRYPT_rootStore != root)
             CertCloseStore(root, 0);
     }
-    CertDuplicateStore(CRYPT_rootStore);
+    CRYPT_rootStore->vtbl->addref(CRYPT_rootStore);
     return CRYPT_rootStore;
 }