# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1115744525 0
# Node ID 65585699d980f3debe2b865d2c17576a68c6c965
# Parent  a6eb598d868660f98fbc082db9821a1fbcb3d691
* add a "label" argument to printhex()
* make some vars static in random.c

diff -r a6eb598d8686 -r 65585699d980 dbutil.c
--- a/dbutil.c	Tue May 10 17:01:16 2005 +0000
+++ b/dbutil.c	Tue May 10 17:02:05 2005 +0000
@@ -430,10 +430,11 @@
 }
 
 #ifdef DEBUG_TRACE
-void printhex(unsigned char* buf, int len) {
+void printhex(const char * label, const unsigned char * buf, int len) {
 
 	int i;
 
+	fprintf(stderr, "%s\n", label);
 	for (i = 0; i < len; i++) {
 		fprintf(stderr, "%02x", buf[i]);
 		if (i % 16 == 15) {
diff -r a6eb598d8686 -r 65585699d980 dbutil.h
--- a/dbutil.h	Tue May 10 17:01:16 2005 +0000
+++ b/dbutil.h	Tue May 10 17:02:05 2005 +0000
@@ -41,7 +41,7 @@
 void dropbear_log(int priority, const char* format, ...);
 #ifdef DEBUG_TRACE
 void dropbear_trace(const char* format, ...);
-void printhex(unsigned char* buf, int len);
+void printhex(const char * label, const unsigned char * buf, int len);
 extern int debug_trace;
 #endif
 char * stripcontrol(const char * text);
diff -r a6eb598d8686 -r 65585699d980 random.c
--- a/random.c	Tue May 10 17:01:16 2005 +0000
+++ b/random.c	Tue May 10 17:02:05 2005 +0000
@@ -27,13 +27,13 @@
 #include "dbutil.h"
 #include "bignum.h"
 
-int donerandinit = 0;
+static int donerandinit = 0;
 
 /* this is used to generate unique output from the same hashpool */
-unsigned int counter = 0;
+static unsigned int counter = 0;
 #define MAX_COUNTER 1000000/* the max value for the counter, so it won't loop */
 
-unsigned char hashpool[SHA1_HASH_SIZE];
+static unsigned char hashpool[SHA1_HASH_SIZE];
 
 #define INIT_SEED_SIZE 32 /* 256 bits */
 
diff -r a6eb598d8686 -r 65585699d980 rsa.c
--- a/rsa.c	Tue May 10 17:01:16 2005 +0000
+++ b/rsa.c	Tue May 10 17:02:05 2005 +0000
@@ -333,7 +333,7 @@
 	mp_clear(&rsa_s);
 
 #if defined(DEBUG_RSA) && defined(DEBUG_TRACE)
-	printhex(buf->data, buf->len);
+	printhex("RSA sig", buf->data, buf->len);
 #endif
 	
 
@@ -357,10 +357,11 @@
 		mp_int * rsa_em) {
 
 	/* ASN1 designator (including the 0x00 preceding) */
-	const char rsa_asn1_magic[] = 
+	const unsigned char rsa_asn1_magic[] = 
 		{0x00, 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 
 		 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14};
-#define RSA_ASN1_MAGIC_LEN 16
+	const unsigned int RSA_ASN1_MAGIC_LEN = 16;
+
 	buffer * rsa_EM = NULL;
 	hash_state hs;
 	unsigned int nsize;