X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=src%2Fwin32%2Fread-registry.c;h=0949aa48c1ca6c04c3e3c99bc37e5392e8c79069;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hp=f4763407d48b82312b547c01f75dac9b733e2511;hpb=927951d1c1ad45ba9e7325f07d996154a91c911b;p=ossec-hids.git

diff --git a/src/win32/read-registry.c b/src/win32/read-registry.c
old mode 100755
new mode 100644
index f476340..0949aa4
--- a/src/win32/read-registry.c
+++ b/src/win32/read-registry.c
@@ -3,14 +3,15 @@
 #include "os_crypto/sha1/sha1_op.h"
 
 /* Default values */
-#define MAX_KEY_LENGTH 255
-#define MAX_KEY	2048
+#define MAX_KEY_LENGTH   255
+#define MAX_KEY         2048
 #define MAX_VALUE_NAME 16383
 
-char *(os_winreg_ignore_list[]) = {"SOFTWARE\\Classes","test123",NULL};
+char *(os_winreg_ignore_list[]) = {"SOFTWARE\\Classes", "test123", NULL};
 
 HKEY sub_tree;
-int os_winreg_open_key(char *subkey);
+void os_winreg_open_key(char *subkey);
+
 
 void os_winreg_querykey(HKEY hKey, char *p_key)
 {
@@ -18,8 +19,8 @@ void os_winreg_querykey(HKEY hKey, char *p_key)
     DWORD j;
 
     /* QueryInfo and EnumKey variables */
-    TCHAR sub_key_name_b[MAX_KEY_LENGTH +1];
-    TCHAR class_name_b[MAX_PATH +1];
+    TCHAR sub_key_name_b[MAX_KEY_LENGTH + 1];
+    TCHAR class_name_b[MAX_PATH + 1];
     DWORD sub_key_name_s;
     DWORD class_name_s = MAX_PATH;
 
@@ -30,81 +31,67 @@ void os_winreg_querykey(HKEY hKey, char *p_key)
     DWORD value_count;
 
     /* Variables for RegEnumValue */
-    TCHAR value_buffer[MAX_VALUE_NAME +1];
-    TCHAR data_buffer[MAX_VALUE_NAME +1];
+    TCHAR value_buffer[MAX_VALUE_NAME + 1];
+    TCHAR data_buffer[MAX_VALUE_NAME + 1];
     DWORD value_size;
     DWORD data_size;
 
     /* Data type for RegEnumValue */
     DWORD data_type = 0;
 
-
-    /* Initializing the memory for some variables */
+    /* Initialize the memory for some variables */
     class_name_b[0] = '\0';
     class_name_b[MAX_PATH] = '\0';
     sub_key_name_b[0] = '\0';
     sub_key_name_b[MAX_KEY_LENGTH] = '\0';
 
-
-    /* We use the class_name, subkey_count and the value count. */
+    /* We only use the class_name, subkey_count and value count */
     rc = RegQueryInfoKey(hKey, class_name_b, &class_name_s, NULL,
-            &subkey_count, NULL, NULL, &value_count,
-            NULL, NULL, NULL, NULL);
+                         &subkey_count, NULL, NULL, &value_count,
+                         NULL, NULL, NULL, NULL);
 
     /* Check return code of QueryInfo */
-    if(rc != ERROR_SUCCESS)
-    {
+    if (rc != ERROR_SUCCESS) {
         return;
     }
 
-
-
-    /* Checking if we have sub keys */
-    if(subkey_count)
-    {
-        /* We open each subkey and call open_key */
-        for(i=0;i<subkey_count;i++)
-        {
+    /* Check if we have sub keys */
+    if (subkey_count) {
+        /* Open each subkey and call open_key */
+        for (i = 0; i < subkey_count; i++) {
             sub_key_name_s = MAX_KEY_LENGTH;
             rc = RegEnumKeyEx(hKey, i, sub_key_name_b, &sub_key_name_s,
                               NULL, NULL, NULL, NULL);
 
-            /* Checking for the rc. */
-            if(rc == ERROR_SUCCESS)
-            {
+            /* Check for the rc */
+            if (rc == ERROR_SUCCESS) {
                 char new_key[MAX_KEY_LENGTH + 2];
-                new_key[MAX_KEY_LENGTH +1] = '\0';
+                new_key[MAX_KEY_LENGTH + 1] = '\0';
 
-                if(p_key)
-                {
+                if (p_key) {
                     snprintf(new_key, MAX_KEY_LENGTH,
-                                      "%s\\%s", p_key, sub_key_name_b);
-                }
-                else
-                {
+                             "%s\\%s", p_key, sub_key_name_b);
+                } else {
                     snprintf(new_key, MAX_KEY_LENGTH, "%s", sub_key_name_b);
                 }
 
-                /* Opening subkey */
+                /* Open subkey */
                 os_winreg_open_key(new_key);
             }
         }
     }
 
-    /* Getting Values (if available) */
-    if (value_count)
-    {
-        /* md5 and sha1 sum */
+    /* Get Values (if available) */
+    if (value_count) {
+        /* MD5 and SHA-1 */
         os_md5 mf_sum;
         os_sha1 sf_sum;
 
-
-        /* Clearing the values for value_size and data_size */
+        /* Clear the values for value_size and data_size */
         value_buffer[MAX_VALUE_NAME] = '\0';
         data_buffer[MAX_VALUE_NAME] = '\0';
 
-        for(i=0;i<value_count;i++)
-        {
+        for (i = 0; i < value_count; i++) {
             value_size = MAX_VALUE_NAME;
             data_size = MAX_VALUE_NAME;
 
@@ -112,37 +99,33 @@ void os_winreg_querykey(HKEY hKey, char *p_key)
             data_buffer[0] = '\0';
 
             rc = RegEnumValue(hKey, i, value_buffer, &value_size,
-                    NULL, &data_type, data_buffer, &data_size);
+                              NULL, &data_type, data_buffer, &data_size);
 
             /* No more values available */
-            if(rc != ERROR_SUCCESS)
-            {
+            if (rc != ERROR_SUCCESS) {
                 break;
             }
 
-            /* Checking if no value name is specified */
-            if(value_buffer[0] == '\0')
-            {
+            /* Check if no value name is specified */
+            if (value_buffer[0] == '\0') {
                 value_buffer[0] = '@';
                 value_buffer[1] = '\0';
             }
-            printf("   (%d) %s=", i+1, value_buffer);
-            switch(data_type)
-            {
+            printf("   (%d) %s=", i + 1, value_buffer);
+            switch (data_type) {
                 case REG_SZ:
                 case REG_EXPAND_SZ:
                     printf("%s\n", data_buffer);
                     break;
                 case REG_MULTI_SZ:
-                    /* Printing multiple strings */
+                    /* Print multiple strings */
                     printf("MULTI_SZ:");
                     char *mt_data;
 
                     mt_data = data_buffer;
-                    while(*mt_data)
-                    {
+                    while (*mt_data) {
                         printf("%s ", mt_data);
-                        mt_data += strlen(mt_data) +1;
+                        mt_data += strlen(mt_data) + 1;
                     }
                     printf("\n");
                     break;
@@ -151,43 +134,41 @@ void os_winreg_querykey(HKEY hKey, char *p_key)
                     break;
                 default:
                     printf("UNSUPPORTED(%d-%d):", (int)data_type, data_size);
-                    for(j = 0;j<data_size;j++)
-                    {
+                    for (j = 0; j < data_size; j++) {
                         printf("%02x", (unsigned int)data_buffer[j]);
                     }
                     printf("\n");
                     break;
             }
-
-            /* Generating checksum of the values */
-
         }
     }
 }
 
-
 /* Open the registry key */
 void os_winreg_open_key(char *subkey)
 {
     int i = 0;
     HKEY oshkey;
 
-
     /* Registry ignore list */
-    if(subkey)
-    {
-        while(os_winreg_ignore_list[i] != NULL)
-        {
-            if(strcasecmp(os_winreg_ignore_list[i], subkey) == 0)
-            {
+    if (subkey) {
+        while (os_winreg_ignore_list[i] != NULL) {
+            if (strcasecmp(os_winreg_ignore_list[i], subkey) == 0) {
                 return;
             }
             i++;
         }
     }
 
-    if(RegOpenKeyEx(sub_tree, subkey, 0, KEY_READ, &oshkey) != ERROR_SUCCESS)
+    if(RegOpenKeyEx(sub_tree, subkey, 0, (KEY_READ | KEY_WOW64_64KEY), &oshkey) != ERROR_SUCCESS)
     {
+        merror(SK_REG_OPEN64, ARGV0, subkey);
+        return;
+    }
+
+    if(RegOpenKeyEx(sub_tree, subkey, 0, (KEY_READ | KEY_WOW64_32KEY), &oshkey) != ERROR_SUCCESS)
+    {
+        merror(SK_REG_OPEN, ARGV0, subkey);
         return;
     }
 
@@ -195,9 +176,7 @@ void os_winreg_open_key(char *subkey)
     RegCloseKey(sub_tree);
 }
 
-
-/* Main function to read the registry.
- */
+/* Main function to read the registry */
 int main(void)
 {
     sub_tree = HKEY_LOCAL_MACHINE;
@@ -205,6 +184,6 @@ int main(void)
 
     os_winreg_open_key(rk);
 
-    return(0);
+    return (0);
 }