# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1364921446 -28800
# Node ID c8c791c5d83ea4cef8351884f90ebe2a1a666446
# Parent  077bbe1eb2201e456d1ed1fb57ed4e6b9b1944f2# Parent  2001bc3c93972d107a73af93e29dc421015cbe91
merge

diff -r 077bbe1eb220 -r c8c791c5d83e random.c
--- a/random.c	Wed Apr 03 00:49:24 2013 +0800
+++ b/random.c	Wed Apr 03 00:50:46 2013 +0800
@@ -157,9 +157,9 @@
 	/* This is opportunistic, don't worry about failure */
 	unsigned char buf[INIT_SEED_SIZE];
 	FILE *f = fopen(DROPBEAR_URANDOM_DEV, "w");
-    if (!f) {
-        return;
-    }
+	if (!f) {
+		return;
+	}
 	genrandom(buf, sizeof(buf));
 	fwrite(buf, sizeof(buf), 1, f);
 	fclose(f);
diff -r 077bbe1eb220 -r c8c791c5d83e termcodes.c
--- a/termcodes.c	Wed Apr 03 00:49:24 2013 +0800
+++ b/termcodes.c	Wed Apr 03 00:50:46 2013 +0800
@@ -107,8 +107,14 @@
 #else
 		{0, 0},
 #endif
-		{0, 0}, /* 42 */
+		/* IUTF8 isn't standardised in rfc4254 but is likely soon.
+		 * Implemented by linux and darwin */
+#ifdef IUTF8
+		{IUTF8, TERMCODE_INPUT},
+#else
 		{0, 0},
+#endif
+		{0, 0}, /* 43 */
 		{0, 0},
 		{0, 0},
 		{0, 0},