From ef0aac432c986f52a1b973bcd73ddf7324e0e70f Mon Sep 17 00:00:00 2001 From: Gaël PORTAY Date: Sat, 2 May 2015 16:02:22 +0200 Subject: Fix unused make_connection_string() warning [-Werror=unused-function] This function is used when USE_VFORK is unset. --- svr-chansession.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'svr-chansession.c') diff --git a/svr-chansession.c b/svr-chansession.c index 5bed8fc..6d08d3f 100644 --- a/svr-chansession.c +++ b/svr-chansession.c @@ -603,6 +603,7 @@ static int sessionpty(struct ChanSess * chansess) { return DROPBEAR_SUCCESS; } +#ifndef USE_VFORK static void make_connection_string(struct ChanSess *chansess) { char *local_ip, *local_port, *remote_ip, *remote_port; size_t len; @@ -624,6 +625,7 @@ static void make_connection_string(struct ChanSess *chansess) { m_free(remote_ip); m_free(remote_port); } +#endif /* Handle a command request from the client. This is used for both shell * and command-execution requests, and passes the command to -- cgit v1.2.3 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] --- auth.h | 2 +- cli-auth.c | 6 +++--- cli-authinteract.c | 10 +++++----- cli-authpasswd.c | 8 ++++---- cli-authpubkey.c | 12 ++++++------ cli-chansession.c | 10 +++++----- cli-kex.c | 10 +++++----- cli-session.c | 2 +- cli-tcpfwd.c | 6 +++--- common-algo.c | 10 +++++----- common-channel.c | 6 +++--- common-kex.c | 4 ++-- common-session.c | 4 ++-- dss.c | 12 ++++++------ gendss.c | 2 +- keyimport.c | 8 ++++---- netio.c | 2 +- rsa.c | 4 ++-- signkey.c | 12 ++++++------ svr-auth.c | 6 +++--- svr-authpubkey.c | 6 +++--- svr-authpubkeyoptions.c | 2 +- svr-chansession.c | 10 +++++----- svr-tcpfwd.c | 2 +- svr-x11fwd.c | 6 +++--- tcp-accept.c | 2 +- 26 files changed, 82 insertions(+), 82 deletions(-) (limited to 'svr-chansession.c') diff --git a/auth.h b/auth.h index 78397ed..250a7f7 100644 --- a/auth.h +++ b/auth.h @@ -133,7 +133,7 @@ struct PubKeyOptions { int no_x11_forwarding_flag; int no_pty_flag; /* "command=" option. */ - unsigned char * forced_command; + char * forced_command; }; #endif diff --git a/cli-auth.c b/cli-auth.c index 70ace65..7039cf0 100644 --- a/cli-auth.c +++ b/cli-auth.c @@ -43,11 +43,11 @@ void cli_auth_getmethods() { TRACE(("enter cli_auth_getmethods")) CHECKCLEARTOWRITE(); buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_REQUEST); - buf_putstring(ses.writepayload, cli_opts.username, + buf_putstring(ses.writepayload, (const unsigned char *)cli_opts.username, strlen(cli_opts.username)); - buf_putstring(ses.writepayload, SSH_SERVICE_CONNECTION, + buf_putstring(ses.writepayload, (const unsigned char *)SSH_SERVICE_CONNECTION, SSH_SERVICE_CONNECTION_LEN); - buf_putstring(ses.writepayload, "none", 4); /* 'none' method */ + buf_putstring(ses.writepayload, (const unsigned char *)"none", 4); /* 'none' method */ encrypt_packet(); diff --git a/cli-authinteract.c b/cli-authinteract.c index a06c9ca..192a54e 100644 --- a/cli-authinteract.c +++ b/cli-authinteract.c @@ -149,22 +149,22 @@ void cli_auth_interactive() { buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_REQUEST); /* username */ - buf_putstring(ses.writepayload, cli_opts.username, + buf_putstring(ses.writepayload, (const unsigned char *)cli_opts.username, strlen(cli_opts.username)); /* service name */ - buf_putstring(ses.writepayload, SSH_SERVICE_CONNECTION, + buf_putstring(ses.writepayload, (const unsigned char *)SSH_SERVICE_CONNECTION, SSH_SERVICE_CONNECTION_LEN); /* method */ - buf_putstring(ses.writepayload, AUTH_METHOD_INTERACT, + buf_putstring(ses.writepayload, (const unsigned char *)AUTH_METHOD_INTERACT, AUTH_METHOD_INTERACT_LEN); /* empty language tag */ - buf_putstring(ses.writepayload, "", 0); + buf_putstring(ses.writepayload, (const unsigned char *)"", 0); /* empty submethods */ - buf_putstring(ses.writepayload, "", 0); + buf_putstring(ses.writepayload, (const unsigned char *)"", 0); encrypt_packet(); cli_ses.interact_request_received = 0; diff --git a/cli-authpasswd.c b/cli-authpasswd.c index 1e0bd41..e014629 100644 --- a/cli-authpasswd.c +++ b/cli-authpasswd.c @@ -140,18 +140,18 @@ void cli_auth_password() { buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_REQUEST); - buf_putstring(ses.writepayload, cli_opts.username, + buf_putstring(ses.writepayload, (const unsigned char *)cli_opts.username, strlen(cli_opts.username)); - buf_putstring(ses.writepayload, SSH_SERVICE_CONNECTION, + buf_putstring(ses.writepayload, (const unsigned char *)SSH_SERVICE_CONNECTION, SSH_SERVICE_CONNECTION_LEN); - buf_putstring(ses.writepayload, AUTH_METHOD_PASSWORD, + buf_putstring(ses.writepayload, (const unsigned char *)AUTH_METHOD_PASSWORD, AUTH_METHOD_PASSWORD_LEN); buf_putbyte(ses.writepayload, 0); /* FALSE - so says the spec */ - buf_putstring(ses.writepayload, password, strlen(password)); + buf_putstring(ses.writepayload, (const unsigned char *)password, strlen(password)); encrypt_packet(); m_burn(password, strlen(password)); diff --git a/cli-authpubkey.c b/cli-authpubkey.c index cdef36e..fa04f17 100644 --- a/cli-authpubkey.c +++ b/cli-authpubkey.c @@ -63,7 +63,7 @@ void recv_msg_userauth_pk_ok() { TRACE(("enter recv_msg_userauth_pk_ok")) - algotype = buf_getstring(ses.payload, &algolen); + algotype = (char *)buf_getstring(ses.payload, &algolen); keytype = signkey_type_from_name(algotype, algolen); TRACE(("recv_msg_userauth_pk_ok: type %d", keytype)) m_free(algotype); @@ -141,7 +141,7 @@ void cli_buf_put_sign(buffer* buf, sign_key *key, int type, static void send_msg_userauth_pubkey(sign_key *key, int type, int realsign) { const char *algoname = NULL; - int algolen; + unsigned int algolen; buffer* sigbuf = NULL; TRACE(("enter send_msg_userauth_pubkey")) @@ -149,20 +149,20 @@ static void send_msg_userauth_pubkey(sign_key *key, int type, int realsign) { buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_REQUEST); - buf_putstring(ses.writepayload, cli_opts.username, + buf_putstring(ses.writepayload, (const unsigned char *)cli_opts.username, strlen(cli_opts.username)); - buf_putstring(ses.writepayload, SSH_SERVICE_CONNECTION, + buf_putstring(ses.writepayload, (const unsigned char *)SSH_SERVICE_CONNECTION, SSH_SERVICE_CONNECTION_LEN); - buf_putstring(ses.writepayload, AUTH_METHOD_PUBKEY, + buf_putstring(ses.writepayload, (const unsigned char *)AUTH_METHOD_PUBKEY, AUTH_METHOD_PUBKEY_LEN); buf_putbyte(ses.writepayload, realsign); algoname = signkey_name_from_type(type, &algolen); - buf_putstring(ses.writepayload, algoname, algolen); + buf_putstring(ses.writepayload, (const unsigned char *)algoname, algolen); buf_put_pub_key(ses.writepayload, key, type); if (realsign) { diff --git a/cli-chansession.c b/cli-chansession.c index 57457d2..9895f13 100644 --- a/cli-chansession.c +++ b/cli-chansession.c @@ -261,7 +261,7 @@ void cli_chansess_winchange() { CHECKCLEARTOWRITE(); buf_putbyte(ses.writepayload, SSH_MSG_CHANNEL_REQUEST); buf_putint(ses.writepayload, channel->remotechan); - buf_putstring(ses.writepayload, "window-change", 13); + buf_putstring(ses.writepayload, (const unsigned char *) "window-change", 13); buf_putbyte(ses.writepayload, 0); /* FALSE says the spec */ put_winsize(); encrypt_packet(); @@ -324,7 +324,7 @@ static void send_chansess_shell_req(struct Channel *channel) { /* XXX TODO */ buf_putbyte(ses.writepayload, 0); /* Don't want replies */ if (cli_opts.cmd) { - buf_putstring(ses.writepayload, cli_opts.cmd, strlen(cli_opts.cmd)); + buf_putstring(ses.writepayload, (const unsigned char *)cli_opts.cmd, strlen(cli_opts.cmd)); } encrypt_packet(); @@ -392,7 +392,7 @@ static const struct ChanType cli_chan_netcat = { void cli_send_netcat_request() { - const unsigned char* source_host = "127.0.0.1"; + const char* source_host = "127.0.0.1"; const int source_port = 22; TRACE(("enter cli_send_netcat_request")) @@ -403,12 +403,12 @@ void cli_send_netcat_request() { dropbear_exit("Couldn't open initial channel"); } - buf_putstring(ses.writepayload, cli_opts.netcat_host, + buf_putstring(ses.writepayload, (const unsigned char *)cli_opts.netcat_host, strlen(cli_opts.netcat_host)); buf_putint(ses.writepayload, cli_opts.netcat_port); /* originator ip - localhost is accurate enough */ - buf_putstring(ses.writepayload, source_host, strlen(source_host)); + buf_putstring(ses.writepayload, (const unsigned char *)source_host, strlen(source_host)); buf_putint(ses.writepayload, source_port); encrypt_packet(); diff --git a/cli-kex.c b/cli-kex.c index a590157..cefc077 100644 --- a/cli-kex.c +++ b/cli-kex.c @@ -322,7 +322,7 @@ static void checkhostkey(unsigned char* keyblob, unsigned int keybloblen) { } /* Compare hostnames */ - if (strncmp(cli_opts.remotehost, buf_getptr(line, hostlen), + if (strncmp(cli_opts.remotehost, (const char *) buf_getptr(line, hostlen), hostlen) != 0) { continue; } @@ -334,7 +334,7 @@ static void checkhostkey(unsigned char* keyblob, unsigned int keybloblen) { continue; } - if (strncmp(buf_getptr(line, algolen), algoname, algolen) != 0) { + if (strncmp((const char *) buf_getptr(line, algolen), algoname, algolen) != 0) { TRACE(("algo doesn't match")) continue; } @@ -346,7 +346,7 @@ static void checkhostkey(unsigned char* keyblob, unsigned int keybloblen) { } /* Now we're at the interesting hostkey */ - ret = cmp_base64_key(keyblob, keybloblen, algoname, algolen, + ret = cmp_base64_key(keyblob, keybloblen, (const unsigned char *) algoname, algolen, line, &fingerprint); if (ret == DROPBEAR_SUCCESS) { @@ -382,9 +382,9 @@ static void checkhostkey(unsigned char* keyblob, unsigned int keybloblen) { fseek(hostsfile, 0, SEEK_END); /* In case it wasn't opened append */ buf_setpos(line, 0); buf_setlen(line, 0); - buf_putbytes(line, cli_opts.remotehost, hostlen); + buf_putbytes(line, (const unsigned char *) cli_opts.remotehost, hostlen); buf_putbyte(line, ' '); - buf_putbytes(line, algoname, algolen); + buf_putbytes(line, (const unsigned char *) algoname, algolen); buf_putbyte(line, ' '); len = line->size - line->pos; /* The only failure with base64 is buffer_overflow, but buf_getwriteptr 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")) diff --git a/cli-tcpfwd.c b/cli-tcpfwd.c index ec65f41..df51e31 100644 --- a/cli-tcpfwd.c +++ b/cli-tcpfwd.c @@ -136,9 +136,9 @@ static void send_msg_global_request_remotetcp(const char *addr, int port) { CHECKCLEARTOWRITE(); buf_putbyte(ses.writepayload, SSH_MSG_GLOBAL_REQUEST); - buf_putstring(ses.writepayload, "tcpip-forward", 13); + buf_putstring(ses.writepayload, (const unsigned char *)"tcpip-forward", 13); buf_putbyte(ses.writepayload, 1); /* want_reply */ - buf_putstring(ses.writepayload, addr, strlen(addr)); + buf_putstring(ses.writepayload, (const unsigned char *)addr, strlen(addr)); buf_putint(ses.writepayload, port); encrypt_packet(); @@ -218,7 +218,7 @@ static int newtcpforwarded(struct Channel * channel) { char portstring[NI_MAXSERV]; int err = SSH_OPEN_ADMINISTRATIVELY_PROHIBITED; - origaddr = buf_getstring(ses.payload, NULL); + origaddr = (char *)buf_getstring(ses.payload, NULL); origport = buf_getint(ses.payload); /* Find which port corresponds. First try and match address as well as port, diff --git a/common-algo.c b/common-algo.c index a3e9d78..0886a2b 100644 --- a/common-algo.c +++ b/common-algo.c @@ -338,19 +338,19 @@ algo_type * buf_match_algo(buffer* buf, algo_type localalgos[], enum kexguess2_used *kexguess2, int *goodguess) { - unsigned char * algolist = NULL; - const unsigned char *remotenames[MAX_PROPOSED_ALGO], *localnames[MAX_PROPOSED_ALGO]; + char * algolist = NULL; + const char *remotenames[MAX_PROPOSED_ALGO], *localnames[MAX_PROPOSED_ALGO]; unsigned int len; unsigned int remotecount, localcount, clicount, servcount, i, j; algo_type * ret = NULL; - const unsigned char **clinames, **servnames; + const char **clinames, **servnames; if (goodguess) { *goodguess = 0; } /* get the comma-separated list from the buffer ie "algo1,algo2,algo3" */ - algolist = buf_getstring(buf, &len); + algolist = (char *) buf_getstring(buf, &len); TRACE(("buf_match_algo: %s", algolist)) if (len > MAX_PROPOSED_ALGO*(MAX_NAME_LEN+1)) { goto out; @@ -488,7 +488,7 @@ algolist_string(algo_type algos[]) buf_setpos(b, b->len); buf_putbyte(b, '\0'); buf_setpos(b, 4); - ret_list = m_strdup(buf_getptr(b, b->len - b->pos)); + ret_list = m_strdup((const char *) buf_getptr(b, b->len - b->pos)); buf_free(b); return ret_list; } diff --git a/common-channel.c b/common-channel.c index 5f4051e..a2ab985 100644 --- a/common-channel.c +++ b/common-channel.c @@ -921,7 +921,7 @@ static void send_msg_channel_window_adjust(struct Channel* channel, /* Handle a new channel request, performing any channel-type-specific setup */ void recv_msg_channel_open() { - unsigned char *type; + char *type; unsigned int typelen; unsigned int remotechan, transwindow, transmaxpacket; struct Channel *channel; @@ -934,7 +934,7 @@ void recv_msg_channel_open() { TRACE(("enter recv_msg_channel_open")) /* get the packet contents */ - type = buf_getstring(ses.payload, &typelen); + type = (char *) buf_getstring(ses.payload, &typelen); remotechan = buf_getint(ses.payload); transwindow = buf_getint(ses.payload); @@ -1149,7 +1149,7 @@ int send_msg_channel_open_init(int fd, const struct ChanType *type) { CHECKCLEARTOWRITE(); buf_putbyte(ses.writepayload, SSH_MSG_CHANNEL_OPEN); - buf_putstring(ses.writepayload, type->name, strlen(type->name)); + buf_putstring(ses.writepayload, (const unsigned char *) type->name, strlen(type->name)); buf_putint(ses.writepayload, chan->index); buf_putint(ses.writepayload, opts.recv_window); buf_putint(ses.writepayload, RECV_MAX_CHANNEL_DATA_LEN); diff --git a/common-kex.c b/common-kex.c index 0e477da..c823f19 100644 --- a/common-kex.c +++ b/common-kex.c @@ -128,10 +128,10 @@ void send_msg_kexinit() { buf_put_algolist(ses.writepayload, ses.compress_algos); /* languages_client_to_server */ - buf_putstring(ses.writepayload, "", 0); + buf_putstring(ses.writepayload, (const unsigned char *) "", 0); /* languages_server_to_client */ - buf_putstring(ses.writepayload, "", 0); + buf_putstring(ses.writepayload, (const unsigned char *) "", 0); /* first_kex_packet_follows */ buf_putbyte(ses.writepayload, (ses.send_kex_first_guess != NULL)); diff --git a/common-session.c b/common-session.c index 083b5c5..e565570 100644 --- a/common-session.c +++ b/common-session.c @@ -329,7 +329,7 @@ void session_cleanup() { void send_session_identification() { buffer *writebuf = buf_new(strlen(LOCAL_IDENT "\r\n") + 1); - buf_putbytes(writebuf, LOCAL_IDENT "\r\n", strlen(LOCAL_IDENT "\r\n")); + buf_putbytes(writebuf, (const unsigned char *) LOCAL_IDENT "\r\n", strlen(LOCAL_IDENT "\r\n")); writebuf_enqueue(writebuf, 0); } @@ -469,7 +469,7 @@ static void send_msg_keepalive() { /* Some peers will reply with SSH_MSG_REQUEST_FAILURE, some will reply with SSH_MSG_UNIMPLEMENTED, some will exit. */ buf_putbyte(ses.writepayload, SSH_MSG_GLOBAL_REQUEST); - buf_putstring(ses.writepayload, DROPBEAR_KEEPALIVE_STRING, + buf_putstring(ses.writepayload, (const unsigned char *) DROPBEAR_KEEPALIVE_STRING, strlen(DROPBEAR_KEEPALIVE_STRING)); } buf_putbyte(ses.writepayload, 1); /* want_reply */ diff --git a/dss.c b/dss.c index d4c4407..e782711 100644 --- a/dss.c +++ b/dss.c @@ -136,7 +136,7 @@ void dss_key_free(dropbear_dss_key *key) { void buf_put_dss_pub_key(buffer* buf, dropbear_dss_key *key) { dropbear_assert(key != NULL); - buf_putstring(buf, SSH_SIGNKEY_DSS, SSH_SIGNKEY_DSS_LEN); + buf_putstring(buf, (const unsigned char*) SSH_SIGNKEY_DSS, SSH_SIGNKEY_DSS_LEN); buf_putmpint(buf, key->p); buf_putmpint(buf, key->q); buf_putmpint(buf, key->g); @@ -165,7 +165,7 @@ int buf_dss_verify(buffer* buf, dropbear_dss_key *key, buffer *data_buf) { DEF_MP_INT(val3); DEF_MP_INT(val4); char * string = NULL; - int stringlen; + unsigned int stringlen; TRACE(("enter buf_dss_verify")) dropbear_assert(key != NULL); @@ -173,7 +173,7 @@ int buf_dss_verify(buffer* buf, dropbear_dss_key *key, buffer *data_buf) { m_mp_init_multi(&val1, &val2, &val3, &val4, NULL); /* get blob, check length */ - string = buf_getstring(buf, &stringlen); + string = (char*) buf_getstring(buf, &stringlen); if (stringlen != 2*SHA1_HASH_SIZE) { goto out; } @@ -186,7 +186,7 @@ int buf_dss_verify(buffer* buf, dropbear_dss_key *key, buffer *data_buf) { /* create the signature - s' and r' are the received signatures in buf */ /* w = (s')-1 mod q */ /* let val1 = s' */ - bytes_to_mp(&val1, &string[SHA1_HASH_SIZE], SHA1_HASH_SIZE); + bytes_to_mp(&val1, (const unsigned char*) &string[SHA1_HASH_SIZE], SHA1_HASH_SIZE); if (mp_cmp(&val1, key->q) != MP_LT) { TRACE(("verify failed, s' >= q")) @@ -208,7 +208,7 @@ int buf_dss_verify(buffer* buf, dropbear_dss_key *key, buffer *data_buf) { /* u2 = ((r')w) mod q */ /* let val1 = r' */ - bytes_to_mp(&val1, &string[0], SHA1_HASH_SIZE); + bytes_to_mp(&val1, (const unsigned char*) &string[0], SHA1_HASH_SIZE); if (mp_cmp(&val1, key->q) != MP_LT) { TRACE(("verify failed, r' >= q")) goto out; @@ -310,7 +310,7 @@ void buf_put_dss_sign(buffer* buf, dropbear_dss_key *key, buffer *data_buf) { dropbear_exit("DSS error"); } - buf_putstring(buf, SSH_SIGNKEY_DSS, SSH_SIGNKEY_DSS_LEN); + buf_putstring(buf, (const unsigned char*) SSH_SIGNKEY_DSS, SSH_SIGNKEY_DSS_LEN); buf_putint(buf, 2*SHA1_HASH_SIZE); writelen = mp_unsigned_bin_size(&dss_r); diff --git a/gendss.c b/gendss.c index 21d13a0..783e25f 100644 --- a/gendss.c +++ b/gendss.c @@ -67,7 +67,7 @@ dropbear_dss_key * gen_dss_priv_key(unsigned int size) { static void getq(dropbear_dss_key *key) { - char buf[QSIZE]; + unsigned char buf[QSIZE]; /* 160 bit prime */ genrandom(buf, QSIZE); diff --git a/keyimport.c b/keyimport.c index d8c0f5c..fdf51c0 100644 --- a/keyimport.c +++ b/keyimport.c @@ -193,7 +193,7 @@ out: static void base64_encode_fp(FILE * fp, unsigned char *data, int datalen, int cpl) { - char out[100]; + unsigned char out[100]; int n; unsigned long outlen; int rawcpl; @@ -445,7 +445,7 @@ static struct openssh_key *load_openssh_key(const char *filename) ret->keyblob_size); } outlen = ret->keyblob_size - ret->keyblob_len; - if (base64_decode(buffer, len, + if (base64_decode((const unsigned char *)buffer, len, ret->keyblob + ret->keyblob_len, &outlen) != CRYPT_OK){ errmsg = "Error decoding base64"; goto error; @@ -602,13 +602,13 @@ static sign_key *openssh_read(const char *filename, char * UNUSED(passphrase)) #ifdef DROPBEAR_DSS if (key->type == OSSH_DSA) { - buf_putstring(blobbuf, "ssh-dss", 7); + buf_putstring(blobbuf, (const unsigned char *)"ssh-dss", 7); retkey->type = DROPBEAR_SIGNKEY_DSS; } #endif #ifdef DROPBEAR_RSA if (key->type == OSSH_RSA) { - buf_putstring(blobbuf, "ssh-rsa", 7); + buf_putstring(blobbuf, (const unsigned char *)"ssh-rsa", 7); retkey->type = DROPBEAR_SIGNKEY_RSA; } #endif diff --git a/netio.c b/netio.c index 16a0d3a..af34a14 100644 --- a/netio.c +++ b/netio.c @@ -100,7 +100,7 @@ static void connect_try_next(struct dropbear_progress_connection *c) { if (c->writequeue) { /* 6 is arbitrary, enough to hold initial packets */ - int iovlen = 6; /* Linux msg_iovlen is a size_t */ + unsigned int iovlen = 6; /* Linux msg_iovlen is a size_t */ struct iovec iov[6]; packet_queue_to_iovec(c->writequeue, iov, &iovlen); message.msg_iov = iov; diff --git a/rsa.c b/rsa.c index 193e577..25fbfe7 100644 --- a/rsa.c +++ b/rsa.c @@ -174,7 +174,7 @@ void buf_put_rsa_pub_key(buffer* buf, dropbear_rsa_key *key) { TRACE(("enter buf_put_rsa_pub_key")) dropbear_assert(key != NULL); - buf_putstring(buf, SSH_SIGNKEY_RSA, SSH_SIGNKEY_RSA_LEN); + buf_putstring(buf, (const unsigned char *) SSH_SIGNKEY_RSA, SSH_SIGNKEY_RSA_LEN); buf_putmpint(buf, key->e); buf_putmpint(buf, key->n); @@ -327,7 +327,7 @@ void buf_put_rsa_sign(buffer* buf, dropbear_rsa_key *key, buffer *data_buf) { mp_clear_multi(&rsa_tmp1, &rsa_tmp2, &rsa_tmp3, NULL); /* create the signature to return */ - buf_putstring(buf, SSH_SIGNKEY_RSA, SSH_SIGNKEY_RSA_LEN); + buf_putstring(buf, (const unsigned char *) SSH_SIGNKEY_RSA, SSH_SIGNKEY_RSA_LEN); nsize = mp_unsigned_bin_size(key->n); diff --git a/signkey.c b/signkey.c index 10a63f2..4b5fb0d 100644 --- a/signkey.c +++ b/signkey.c @@ -138,14 +138,14 @@ signkey_key_ptr(sign_key *key, enum signkey_type type) { * on return is set to the type read (useful when type = _ANY) */ int buf_get_pub_key(buffer *buf, sign_key *key, enum signkey_type *type) { - unsigned char* ident; + char *ident; unsigned int len; enum signkey_type keytype; int ret = DROPBEAR_FAILURE; TRACE2(("enter buf_get_pub_key")) - ident = buf_getstring(buf, &len); + ident = (char *) buf_getstring(buf, &len); keytype = signkey_type_from_name(ident, len); m_free(ident); @@ -209,14 +209,14 @@ int buf_get_pub_key(buffer *buf, sign_key *key, enum signkey_type *type) { * on return is set to the type read (useful when type = _ANY) */ int buf_get_priv_key(buffer *buf, sign_key *key, enum signkey_type *type) { - unsigned char* ident; + char *ident; unsigned int len; enum signkey_type keytype; int ret = DROPBEAR_FAILURE; TRACE2(("enter buf_get_priv_key")) - ident = buf_getstring(buf, &len); + ident = (char *)buf_getstring(buf, &len); keytype = signkey_type_from_name(ident, len); m_free(ident); @@ -515,14 +515,14 @@ void buf_put_sign(buffer* buf, sign_key *key, enum signkey_type type, * signature blob */ int buf_verify(buffer * buf, sign_key *key, buffer *data_buf) { - unsigned char * type_name = NULL; + char *type_name = NULL; unsigned int type_name_len = 0; enum signkey_type type; TRACE(("enter buf_verify")) buf_getint(buf); /* blob length */ - type_name = buf_getstring(buf, &type_name_len); + type_name = (char *) buf_getstring(buf, &type_name_len); type = signkey_type_from_name(type_name, type_name_len); m_free(type_name); diff --git a/svr-auth.c b/svr-auth.c index 89760ef..fc99063 100644 --- a/svr-auth.c +++ b/svr-auth.c @@ -89,7 +89,7 @@ void send_msg_userauth_banner(buffer *banner) { buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_BANNER); buf_putbufstring(ses.writepayload, banner); - buf_putstring(ses.writepayload, "en", 2); + buf_putstring(ses.writepayload, (const unsigned char *)"en", 2); encrypt_packet(); @@ -333,14 +333,14 @@ void send_msg_userauth_failure(int partial, int incrfail) { typebuf = buf_new(30); /* long enough for PUBKEY and PASSWORD */ if (ses.authstate.authtypes & AUTH_TYPE_PUBKEY) { - buf_putbytes(typebuf, AUTH_METHOD_PUBKEY, AUTH_METHOD_PUBKEY_LEN); + buf_putbytes(typebuf, (const unsigned char *)AUTH_METHOD_PUBKEY, AUTH_METHOD_PUBKEY_LEN); if (ses.authstate.authtypes & AUTH_TYPE_PASSWORD) { buf_putbyte(typebuf, ','); } } if (ses.authstate.authtypes & AUTH_TYPE_PASSWORD) { - buf_putbytes(typebuf, AUTH_METHOD_PASSWORD, AUTH_METHOD_PASSWORD_LEN); + buf_putbytes(typebuf, (const unsigned char *)AUTH_METHOD_PASSWORD, AUTH_METHOD_PASSWORD_LEN); } buf_putbufstring(ses.writepayload, typebuf); diff --git a/svr-authpubkey.c b/svr-authpubkey.c index e8af319..82769eb 100644 --- a/svr-authpubkey.c +++ b/svr-authpubkey.c @@ -260,9 +260,9 @@ static int checkpubkey(unsigned char* algo, unsigned int algolen, /* check the key type - will fail if there are options */ TRACE(("a line!")) - if (strncmp(buf_getptr(line, algolen), algo, algolen) != 0) { + if (strncmp((const char *) buf_getptr(line, algolen), algo, algolen) != 0) { int is_comment = 0; - char *options_start = NULL; + unsigned char *options_start = NULL; int options_len = 0; int escape, quoted; @@ -308,7 +308,7 @@ static int checkpubkey(unsigned char* algo, unsigned int algolen, if (line->pos + algolen+3 > line->len) { continue; } - if (strncmp(buf_getptr(line, algolen), algo, algolen) != 0) { + if (strncmp((const char *) buf_getptr(line, algolen), algo, algolen) != 0) { continue; } } diff --git a/svr-authpubkeyoptions.c b/svr-authpubkeyoptions.c index 71d7c14..c296141 100644 --- a/svr-authpubkeyoptions.c +++ b/svr-authpubkeyoptions.c @@ -120,7 +120,7 @@ static int match_option(buffer *options_buf, const char *opt_name) { if (options_buf->len - options_buf->pos < len) { return DROPBEAR_FAILURE; } - if (strncasecmp(buf_getptr(options_buf, len), opt_name, len) == 0) { + if (strncasecmp((const char *) buf_getptr(options_buf, len), opt_name, len) == 0) { buf_incrpos(options_buf, len); return DROPBEAR_SUCCESS; } diff --git a/svr-chansession.c b/svr-chansession.c index 6d08d3f..1bc4da7 100644 --- a/svr-chansession.c +++ b/svr-chansession.c @@ -183,7 +183,7 @@ static void send_msg_chansess_exitstatus(struct Channel * channel, buf_putbyte(ses.writepayload, SSH_MSG_CHANNEL_REQUEST); buf_putint(ses.writepayload, channel->remotechan); - buf_putstring(ses.writepayload, "exit-status", 11); + buf_putstring(ses.writepayload, (const unsigned char *) "exit-status", 11); buf_putbyte(ses.writepayload, 0); /* boolean FALSE */ buf_putint(ses.writepayload, chansess->exit.exitstatus); @@ -219,12 +219,12 @@ static void send_msg_chansess_exitsignal(struct Channel * channel, buf_putbyte(ses.writepayload, SSH_MSG_CHANNEL_REQUEST); buf_putint(ses.writepayload, channel->remotechan); - buf_putstring(ses.writepayload, "exit-signal", 11); + buf_putstring(ses.writepayload, (const unsigned char *) "exit-signal", 11); buf_putbyte(ses.writepayload, 0); /* boolean FALSE */ buf_putstring(ses.writepayload, signame, strlen(signame)); buf_putbyte(ses.writepayload, chansess->exit.exitcore); - buf_putstring(ses.writepayload, "", 0); /* error msg */ - buf_putstring(ses.writepayload, "", 0); /* lang */ + buf_putstring(ses.writepayload, (const unsigned char *) "", 0); /* error msg */ + buf_putstring(ses.writepayload, (const unsigned char *) "", 0); /* lang */ encrypt_packet(); } @@ -557,7 +557,7 @@ static void get_termmodes(struct ChanSess *chansess) { static int sessionpty(struct ChanSess * chansess) { unsigned int termlen; - unsigned char namebuf[65]; + char namebuf[65]; struct passwd * pw = NULL; TRACE(("enter sessionpty")) diff --git a/svr-tcpfwd.c b/svr-tcpfwd.c index b3928bc..490ec5c 100644 --- a/svr-tcpfwd.c +++ b/svr-tcpfwd.c @@ -237,7 +237,7 @@ static int newtcpdirect(struct Channel * channel) { unsigned char* orighost = NULL; unsigned int origport; char portstring[NI_MAXSERV]; - int len; + unsigned int len; int err = SSH_OPEN_ADMINISTRATIVELY_PROHIBITED; TRACE(("newtcpdirect channel %d", channel->index)) diff --git a/svr-x11fwd.c b/svr-x11fwd.c index 6400c06..d11ff4e 100644 --- a/svr-x11fwd.c +++ b/svr-x11fwd.c @@ -58,8 +58,8 @@ int x11req(struct ChanSess * chansess) { } chansess->x11singleconn = buf_getbool(ses.payload); - chansess->x11authprot = buf_getstring(ses.payload, NULL); - chansess->x11authcookie = buf_getstring(ses.payload, NULL); + chansess->x11authprot = (char *)buf_getstring(ses.payload, NULL); + chansess->x11authcookie = (char *)buf_getstring(ses.payload, NULL); chansess->x11screennum = buf_getint(ses.payload); /* create listening socket */ @@ -203,7 +203,7 @@ static int send_msg_channel_open_x11(int fd, struct sockaddr_in* addr) { if (send_msg_channel_open_init(fd, &chan_x11) == DROPBEAR_SUCCESS) { ipstring = inet_ntoa(addr->sin_addr); - buf_putstring(ses.writepayload, ipstring, strlen(ipstring)); + buf_putstring(ses.writepayload, (const unsigned char *)ipstring, strlen(ipstring)); buf_putint(ses.writepayload, addr->sin_port); encrypt_packet(); diff --git a/tcp-accept.c b/tcp-accept.c index 35be32d..596d9c9 100644 --- a/tcp-accept.c +++ b/tcp-accept.c @@ -98,7 +98,7 @@ static void tcp_acceptor(struct Listener *listener, int sock) { buf_putint(ses.writepayload, port); /* originator ip */ - buf_putstring(ses.writepayload, ipstring, strlen(ipstring)); + buf_putstring(ses.writepayload, (const unsigned char *)ipstring, strlen(ipstring)); /* originator port */ buf_putint(ses.writepayload, atol(portstring)); -- cgit v1.2.3 From 9f975113564ba06a521aab33f0ab30206ab6d7c8 Mon Sep 17 00:00:00 2001 From: Gaël PORTAY Date: Sat, 2 May 2015 16:01:13 +0200 Subject: Turn ChanSess's tty and term attributes into char * --- chansession.h | 4 ++-- svr-chansession.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'svr-chansession.c') diff --git a/chansession.h b/chansession.h index 3dd58ac..66f5504 100644 --- a/chansession.h +++ b/chansession.h @@ -45,8 +45,8 @@ struct ChanSess { /* pty details */ int master; /* the master terminal fd*/ int slave; - unsigned char * tty; - unsigned char * term; + char * tty; + char * term; /* exit details */ struct exitinfo exit; diff --git a/svr-chansession.c b/svr-chansession.c index 1bc4da7..a27c8f9 100644 --- a/svr-chansession.c +++ b/svr-chansession.c @@ -567,7 +567,7 @@ static int sessionpty(struct ChanSess * chansess) { return DROPBEAR_FAILURE; } - chansess->term = buf_getstring(ses.payload, &termlen); + chansess->term = (char *) buf_getstring(ses.payload, &termlen); if (termlen > MAX_TERM_LEN) { /* TODO send disconnect ? */ TRACE(("leave sessionpty: term len too long")) @@ -583,7 +583,7 @@ static int sessionpty(struct ChanSess * chansess) { return DROPBEAR_FAILURE; } - chansess->tty = (char*)m_strdup(namebuf); + chansess->tty = m_strdup(namebuf); if (!chansess->tty) { dropbear_exit("Out of memory"); /* TODO disconnect */ } -- cgit v1.2.3 From e5ce3fc51b72d3699f527276ef7c5100bd1c3135 Mon Sep 17 00:00:00 2001 From: Gaël PORTAY Date: Sun, 3 May 2015 01:12:24 +0200 Subject: Turn type local variable into char * --- svr-chansession.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'svr-chansession.c') diff --git a/svr-chansession.c b/svr-chansession.c index a27c8f9..c496ff9 100644 --- a/svr-chansession.c +++ b/svr-chansession.c @@ -343,7 +343,7 @@ static void closechansess(struct Channel *channel) { * or x11/authagent forwarding. These are passed to appropriate handlers */ static void chansessionrequest(struct Channel *channel) { - unsigned char * type = NULL; + char * type = NULL; unsigned int typelen; unsigned char wantreply; int ret = 1; @@ -351,7 +351,7 @@ static void chansessionrequest(struct Channel *channel) { TRACE(("enter chansessionrequest")) - type = buf_getstring(ses.payload, &typelen); + type = (char *) buf_getstring(ses.payload, &typelen); wantreply = buf_getbool(ses.payload); if (typelen > MAX_NAME_LEN) { -- cgit v1.2.3 From 05b36b484e93557928d4ae90a7eea5a57764c372 Mon Sep 17 00:00:00 2001 From: Gaël PORTAY Date: Sat, 2 May 2015 23:28:28 +0200 Subject: Turn ChanSess's cmd attribute into char * --- chansession.h | 2 +- svr-chansession.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'svr-chansession.c') diff --git a/chansession.h b/chansession.h index 66f5504..6eb8c76 100644 --- a/chansession.h +++ b/chansession.h @@ -39,7 +39,7 @@ struct exitinfo { struct ChanSess { - unsigned char * cmd; /* command to exec */ + char * cmd; /* command to exec */ pid_t pid; /* child process pid */ /* pty details */ diff --git a/svr-chansession.c b/svr-chansession.c index c496ff9..a630112 100644 --- a/svr-chansession.c +++ b/svr-chansession.c @@ -649,7 +649,7 @@ static int sessioncommand(struct Channel *channel, struct ChanSess *chansess, if (iscmd) { /* "exec" */ if (chansess->cmd == NULL) { - chansess->cmd = buf_getstring(ses.payload, &cmdlen); + chansess->cmd = (char *) buf_getstring(ses.payload, &cmdlen); if (cmdlen > MAX_CMD_LEN) { m_free(chansess->cmd); -- cgit v1.2.3 From 292656d899f4f5fad8f5ed67ec00806c6e410b8d Mon Sep 17 00:00:00 2001 From: Gaël PORTAY Date: Sat, 2 May 2015 23:32:13 +0200 Subject: Turn signame local variable into char * --- svr-chansession.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'svr-chansession.c') diff --git a/svr-chansession.c b/svr-chansession.c index a630112..18e4bf0 100644 --- a/svr-chansession.c +++ b/svr-chansession.c @@ -221,7 +221,7 @@ static void send_msg_chansess_exitsignal(struct Channel * channel, buf_putint(ses.writepayload, channel->remotechan); buf_putstring(ses.writepayload, (const unsigned char *) "exit-signal", 11); buf_putbyte(ses.writepayload, 0); /* boolean FALSE */ - buf_putstring(ses.writepayload, signame, strlen(signame)); + buf_putstring(ses.writepayload, (const unsigned char *) signame, strlen(signame)); buf_putbyte(ses.writepayload, chansess->exit.exitcore); buf_putstring(ses.writepayload, (const unsigned char *) "", 0); /* error msg */ buf_putstring(ses.writepayload, (const unsigned char *) "", 0); /* lang */ @@ -406,7 +406,7 @@ out: static int sessionsignal(struct ChanSess *chansess) { int sig = 0; - unsigned char* signame = NULL; + char* signame = NULL; int i; if (chansess->pid == 0) { @@ -414,7 +414,7 @@ static int sessionsignal(struct ChanSess *chansess) { return DROPBEAR_FAILURE; } - signame = buf_getstring(ses.payload, NULL); + signame = (char *) buf_getstring(ses.payload, NULL); i = 0; while (signames[i].name != 0) { -- cgit v1.2.3