diff --git a/dbutil.c b/dbutil.c index 5f3a45dfb84192247f72c6b201cbe7c2a2b709ec..45c720e3308189ee1ee968e9dbc9fece6284e288 100644 --- a/dbutil.c +++ b/dbutil.c @@ -430,10 +430,11 @@ char* getaddrhostname(struct sockaddr_storage * addr) { } #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 --git a/dbutil.h b/dbutil.h index 6363f70d1107d135f638c4500c9fe30f89b50fe2..d90494944462e3ee89500f3e7b7a1bfae016c4d0 100644 --- a/dbutil.h +++ b/dbutil.h @@ -41,7 +41,7 @@ void dropbear_close(const char* format, ...); 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 --git a/random.c b/random.c index 8012148bc04932afefd687a27bed4dcf68dacaba..d58c8a834dd0ad7ad75c6975566763be832a91c0 100644 --- a/random.c +++ b/random.c @@ -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 --git a/rsa.c b/rsa.c index 8b2436023a44677db596b1ca25e7ec18c88b7acf..f86fdd97946c688e84daa1547c40934f8cd53818 100644 --- a/rsa.c +++ b/rsa.c @@ -333,7 +333,7 @@ void buf_put_rsa_sign(buffer* buf, rsa_key *key, const unsigned char* data, 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 @@ static void rsa_pad_em(rsa_key * key, 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;