X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/93b581bd031b2270deb7f45440e61a1044fe94da..0183b2423868df18b2297c9052854e5a7db79425:/misc.c

diff --git a/misc.c b/misc.c
index ee1abf7b..2d0a4634 100644
--- a/misc.c
+++ b/misc.c
@@ -1,6 +1,6 @@
-#include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <assert.h>
 #include "putty.h"
 
@@ -51,6 +51,35 @@ char *dupcat(char *s1, ...)
 }
 
 /* ----------------------------------------------------------------------
+ * Base64 encoding routine. This is required in public-key writing
+ * but also in HTTP proxy handling, so it's centralised here.
+ */
+
+void base64_encode_atom(unsigned char *data, int n, char *out)
+{
+    static const char base64_chars[] =
+	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+    unsigned word;
+
+    word = data[0] << 16;
+    if (n > 1)
+	word |= data[1] << 8;
+    if (n > 2)
+	word |= data[2];
+    out[0] = base64_chars[(word >> 18) & 0x3F];
+    out[1] = base64_chars[(word >> 12) & 0x3F];
+    if (n > 1)
+	out[2] = base64_chars[(word >> 6) & 0x3F];
+    else
+	out[2] = '=';
+    if (n > 2)
+	out[3] = base64_chars[word & 0x3F];
+    else
+	out[3] = '=';
+}
+
+/* ----------------------------------------------------------------------
  * Generic routines to deal with send buffers: a linked list of
  * smallish blocks, with the operations
  * 
@@ -59,6 +88,7 @@ char *dupcat(char *s1, ...)
  *  - return a (pointer,length) pair giving some initial data in
  *    the list, suitable for passing to a send or write system
  *    call
+ *  - retrieve a larger amount of initial data from the list
  *  - return the current size of the buffer chain in bytes
  */
 
@@ -126,16 +156,23 @@ void bufchain_add(bufchain *ch, void *data, int len)
 
 void bufchain_consume(bufchain *ch, int len)
 {
+    struct bufchain_granule *tmp;
+
     assert(ch->buffersize >= len);
-    assert(ch->head != NULL && ch->head->bufpos + len <= ch->head->buflen);
-    ch->head->bufpos += len;
-    ch->buffersize -= len;
-    if (ch->head->bufpos >= ch->head->buflen) {
-	struct bufchain_granule *tmp = ch->head;
-	ch->head = tmp->next;
-	sfree(tmp);
-	if (!ch->head)
-	    ch->tail = NULL;
+    while (len > 0) {
+	int remlen = len;
+	assert(ch->head != NULL);
+	if (remlen >= ch->head->buflen - ch->head->bufpos) {
+	    remlen = ch->head->buflen - ch->head->bufpos;
+	    tmp = ch->head;
+	    ch->head = tmp->next;
+	    sfree(tmp);
+	    if (!ch->head)
+		ch->tail = NULL;
+	} else
+	    ch->head->bufpos += remlen;
+	ch->buffersize -= remlen;
+	len -= remlen;
     }
 }
 
@@ -145,6 +182,28 @@ void bufchain_prefix(bufchain *ch, void **data, int *len)
     *data = ch->head->buf + ch->head->bufpos;
 }
 
+void bufchain_fetch(bufchain *ch, void *data, int len)
+{
+    struct bufchain_granule *tmp;
+    char *data_c = (char *)data;
+
+    tmp = ch->head;
+
+    assert(ch->buffersize >= len);
+    while (len > 0) {
+	int remlen = len;
+
+	assert(tmp != NULL);
+	if (remlen >= tmp->buflen - tmp->bufpos)
+	    remlen = tmp->buflen - tmp->bufpos;
+	memcpy(data_c, tmp->buf + tmp->bufpos, remlen);
+
+	tmp = tmp->next;
+	len -= remlen;
+	data_c += remlen;
+    }
+}
+
 /* ----------------------------------------------------------------------
  * My own versions of malloc, realloc and free. Because I want
  * malloc and realloc to bomb out and exit the program if they run
@@ -294,7 +353,7 @@ static void *minefield_alloc(int size)
     /*
      * Update the admin region.
      */
-    for (i = start + 2; i < start + npages - 1; i++)
+    for (i = start + 2; i < start + npages + 1; i++)
 	minefield_admin[i] = 0xFFFE;   /* used but no region starts here */
     minefield_admin[start + 1] = region_start % PAGESIZE;
 
@@ -413,9 +472,7 @@ void *safemalloc(size_t size)
 #else
 	strcpy(str, "Out of memory!");
 #endif
-	MessageBox(NULL, str, "PuTTY Fatal Error",
-		   MB_SYSTEMMODAL | MB_ICONERROR | MB_OK);
-	cleanup_exit(1);
+	modalfatalbox(str);
     }
 #ifdef MALLOC_LOG
     if (fp)
@@ -450,9 +507,7 @@ void *saferealloc(void *ptr, size_t size)
 #else
 	strcpy(str, "Out of memory!");
 #endif
-	MessageBox(NULL, str, "PuTTY Fatal Error",
-		   MB_SYSTEMMODAL | MB_ICONERROR | MB_OK);
-	cleanup_exit(1);
+	modalfatalbox(str);
     }
 #ifdef MALLOC_LOG
     if (fp)