Begin destabilisation in the wake of 0.53! This checkin contains the

[u/mdw/putty] / noise.c

diff --git a/noise.c b/noise.c
index 88b13a9..141f111 100644 (file)
--- a/noise.c
+++ b/noise.c
@@ -11,15 +11,23 @@
 #include "storage.h"
 
 /*
+ * GetSystemPowerStatus function.
+ */
+typedef BOOL(WINAPI * gsps_t) (LPSYSTEM_POWER_STATUS);
+static gsps_t gsps;
+
+/*
  * This function is called once, at PuTTY startup, and will do some
  * seriously silly things like listing directories and getting disk
  * free space and a process snapshot.
  */
 
-void noise_get_heavy(void (*func) (void *, int)) {
+void noise_get_heavy(void (*func) (void *, int))
+{
     HANDLE srch;
     WIN32_FIND_DATA finddata;
-    char winpath[MAX_PATH+3];
+    char winpath[MAX_PATH + 3];
+    HMODULE mod;
 
     GetWindowsDirectory(winpath, sizeof(winpath));
     strcat(winpath, "\\*");
@@ -32,14 +40,23 @@ void noise_get_heavy(void (*func) (void *, int)) {
     }
 
     read_random_seed(func);
+
+    gsps = NULL;
+    mod = GetModuleHandle("KERNEL32");
+    if (mod) {
+       gsps = (gsps_t) GetProcAddress(mod, "GetSystemPowerStatus");
+    }
 }
 
-void random_save_seed(void) {
+void random_save_seed(void)
+{
     int len;
     void *data;
 
-    random_get_savedata(&data, &len);
-    write_random_seed(data, len);
+    if (random_active) {
+       random_get_savedata(&data, &len);
+       write_random_seed(data, len);
+    }
 }
 
 /*
@@ -47,7 +64,8 @@ void random_save_seed(void) {
  * stirring, and will acquire the system time in all available
  * forms and the battery status.
  */
-void noise_get_light(void (*func) (void *, int)) {
+void noise_get_light(void (*func) (void *, int))
+{
     SYSTEMTIME systime;
     DWORD adjust[2];
     BOOL rubbish;
@@ -59,10 +77,50 @@ void noise_get_light(void (*func) (void *, int)) {
     GetSystemTimeAdjustment(&adjust[0], &adjust[1], &rubbish);
     func(&adjust, sizeof(adjust));
 
-#ifndef WIN32S_COMPAT
-    if (GetSystemPowerStatus(&pwrstat))
-       func(&pwrstat, sizeof(pwrstat));
-#endif
+    /*
+     * Call GetSystemPowerStatus if present.
+     */
+    if (gsps) {
+       if (gsps(&pwrstat))
+           func(&pwrstat, sizeof(pwrstat));
+    }
+}
+
+/*
+ * This function is called on a timer, and it will monitor
+ * frequently changing quantities such as the state of physical and
+ * virtual memory, the state of the process's message queue, which
+ * window is in the foreground, which owns the clipboard, etc.
+ */
+void noise_regular(void)
+{
+    HWND w;
+    DWORD z;
+    POINT pt;
+    MEMORYSTATUS memstat;
+    FILETIME times[4];
+
+    w = GetForegroundWindow();
+    random_add_noise(&w, sizeof(w));
+    w = GetCapture();
+    random_add_noise(&w, sizeof(w));
+    w = GetClipboardOwner();
+    random_add_noise(&w, sizeof(w));
+    z = GetQueueStatus(QS_ALLEVENTS);
+    random_add_noise(&z, sizeof(z));
+
+    GetCursorPos(&pt);
+    random_add_noise(&pt, sizeof(pt));
+
+    GlobalMemoryStatus(&memstat);
+    random_add_noise(&memstat, sizeof(memstat));
+
+    GetThreadTimes(GetCurrentThread(), times, times + 1, times + 2,
+                  times + 3);
+    random_add_noise(&times, sizeof(times));
+    GetProcessTimes(GetCurrentProcess(), times, times + 1, times + 2,
+                   times + 3);
+    random_add_noise(&times, sizeof(times));
 }
 
 /*
@@ -71,7 +129,8 @@ void noise_get_light(void (*func) (void *, int)) {
  * counter to the noise pool. It gets the scan code or mouse
  * position passed in.
  */
-void noise_ultralight(DWORD data) {
+void noise_ultralight(unsigned long data)
+{
     DWORD wintime;
     LARGE_INTEGER perftime;