From 224b16b2470ab764e854eb4a7cdd568353655afc Mon Sep 17 00:00:00 2001 From: Gaël PORTAY Date: Sat, 2 May 2015 15:59:06 +0200 Subject: Fix pointer differ in signess warnings [-Werror=pointer-sign] --- cli-session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cli-session.c') diff --git a/cli-session.c b/cli-session.c index 815f5b6..1d5f998 100644 --- a/cli-session.c +++ b/cli-session.c @@ -192,7 +192,7 @@ static void send_msg_service_request(char* servicename) { CHECKCLEARTOWRITE(); buf_putbyte(ses.writepayload, SSH_MSG_SERVICE_REQUEST); - buf_putstring(ses.writepayload, servicename, strlen(servicename)); + buf_putstring(ses.writepayload, (const unsigned char *)servicename, strlen(servicename)); encrypt_packet(); TRACE(("leave send_msg_service_request")) -- cgit v1.2.3 From 7928d83b02f0d2fb1f7d5ac886baf3724a9561a3 Mon Sep 17 00:00:00 2001 From: Gaël PORTAY Date: Sat, 2 May 2015 16:08:08 +0200 Subject: Turn cleantext()'s dirtytext argument into char * --- cli-session.c | 4 ++-- session.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cli-session.c') diff --git a/cli-session.c b/cli-session.c index 1d5f998..8bf530c 100644 --- a/cli-session.c +++ b/cli-session.c @@ -372,10 +372,10 @@ static void cli_remoteclosed() { /* Operates in-place turning dirty (untrusted potentially containing control * characters) text into clean text. * Note: this is safe only with ascii - other charsets could have problems. */ -void cleantext(unsigned char* dirtytext) { +void cleantext(char* dirtytext) { unsigned int i, j; - unsigned char c; + char c; j = 0; for (i = 0; dirtytext[i] != '\0'; i++) { diff --git a/session.h b/session.h index 0059d94..0c96075 100644 --- a/session.h +++ b/session.h @@ -63,7 +63,7 @@ void svr_dropbear_log(int priority, const char* format, va_list param); /* Client */ void cli_session(int sock_in, int sock_out, struct dropbear_progress_connection *progress) ATTRIB_NORETURN; void cli_connected(int result, int sock, void* userdata, const char *errstring); -void cleantext(unsigned char* dirtytext); +void cleantext(char* dirtytext); /* crypto parameters that are stored individually for transmit and receive */ struct key_context_directional { -- cgit v1.2.3