diff --git a/common-algo.c b/common-algo.c
index 9a3664b..a3e9d78 100644
--- a/common-algo.c
+++ b/common-algo.c
@@ -87,7 +87,7 @@ const struct dropbear_cipher dropbear_nocipher =
#ifdef DROPBEAR_ENABLE_CBC_MODE
const struct dropbear_cipher_mode dropbear_mode_cbc =
{(void*)cbc_start, (void*)cbc_encrypt, (void*)cbc_decrypt};
-#endif // DROPBEAR_ENABLE_CBC_MODE
+#endif /* DROPBEAR_ENABLE_CBC_MODE */
const struct dropbear_cipher_mode dropbear_mode_none =
{void_start, void_cipher, void_cipher};
@@ -102,7 +102,7 @@ static int dropbear_big_endian_ctr_start(int cipher,
}
const struct dropbear_cipher_mode dropbear_mode_ctr =
{(void*)dropbear_big_endian_ctr_start, (void*)ctr_encrypt, (void*)ctr_decrypt};
-#endif // DROPBEAR_ENABLE_CTR_MODE
+#endif /* DROPBEAR_ENABLE_CTR_MODE */
/* Mapping of ssh hashes to libtomcrypt hashes, including keysize etc.
{&hash_desc, keysize, hashsize} */
diff --git a/common-channel.c b/common-channel.c
index 049658d..db47695 100644
--- a/common-channel.c
+++ b/common-channel.c
@@ -402,7 +402,7 @@ static void check_in_progress(struct Channel *channel) {
/* Send the close message and set the channel as closed */
static void send_msg_channel_close(struct Channel *channel) {
- TRACE(("enter send_msg_channel_close %p", channel))
+ TRACE(("enter send_msg_channel_close %p", (void*)channel))
if (channel->type->closehandler
&& !channel->close_handler_done) {
channel->type->closehandler(channel);
@@ -616,7 +616,7 @@ void recv_msg_channel_request() {
channel = getchannel();
- TRACE(("enter recv_msg_channel_request %p", channel))
+ TRACE(("enter recv_msg_channel_request %p", (void*)channel))
if (channel->sent_close) {
TRACE(("leave recv_msg_channel_request: already closed channel"))
@@ -1141,10 +1141,10 @@ void send_msg_request_failure() {
}
struct Channel* get_any_ready_channel() {
+ size_t i;
if (ses.chancount == 0) {
return NULL;
}
- size_t i;
for (i = 0; i < ses.chansize; i++) {
struct Channel *chan = ses.channels[i];
if (chan
diff --git a/common-session.c b/common-session.c
index 26ef147..d820d64 100644
--- a/common-session.c
+++ b/common-session.c
@@ -399,16 +399,16 @@ static int ident_readln(int fd, char* buf, int count) {
}
void ignore_recv_response() {
- // Do nothing
+ /* Do nothing */
TRACE(("Ignored msg_request_response"))
}
static void send_msg_keepalive() {
- CHECKCLEARTOWRITE();
time_t old_time_idle = ses.last_packet_time_idle;
-
struct Channel *chan = get_any_ready_channel();
+ CHECKCLEARTOWRITE();
+
if (chan) {
/* Channel requests are preferable, more implementations
handle them than SSH_MSG_GLOBAL_REQUEST */
diff --git a/curve25519-donna.c b/curve25519-donna.c
index bb1262e..3309610 100644
--- a/curve25519-donna.c
+++ b/curve25519-donna.c
@@ -527,7 +527,7 @@ static void fmonty(limb *x2, limb *z2, /* output 2Q */
memcpy(origx, x, 10 * sizeof(limb));
fsum(x, z);
- fdifference(z, origx); // does x - z
+ fdifference(z, origx); /* does x - z */
memcpy(origxprime, xprime, sizeof(limb) * 10);
fsum(xprime, zprime);
@@ -554,7 +554,7 @@ static void fmonty(limb *x2, limb *z2, /* output 2Q */
fproduct(x2, xx, zz);
freduce_degree(x2);
freduce_coefficients(x2);
- fdifference(zz, xx); // does zz = xx - zz
+ fdifference(zz, xx); /* does zz = xx - zz */
memset(zzz + 10, 0, sizeof(limb) * 9);
fscalar_product(zzz, zz, 121665);
/* No need to call freduce_degree here:
@@ -641,9 +641,9 @@ cmult(limb *resultx, limb *resultz, const u8 *n, const limb *q) {
memcpy(resultz, nqz, sizeof(limb) * 10);
}
-// -----------------------------------------------------------------------------
-// Shamelessly copied from djb's code
-// -----------------------------------------------------------------------------
+/* -----------------------------------------------------------------------------
+ * Shamelessly copied from djb's code
+ * ----------------------------------------------------------------------------- */
static void
crecip(limb *out, const limb *z) {
limb z2[10];
diff --git a/dbutil.c b/dbutil.c
index ec108bf..eb781c3 100644
--- a/dbutil.c
+++ b/dbutil.c
@@ -868,12 +868,12 @@ out:
/* make sure that the socket closes */
void m_close(int fd) {
+ int val;
if (fd == -1) {
return;
}
- int val;
do {
val = close(fd);
} while (val < 0 && errno == EINTR);
diff --git a/keyimport.c b/keyimport.c
index 6f2634f..54eb5c3 100644
--- a/keyimport.c
+++ b/keyimport.c
@@ -1046,6 +1046,7 @@ static int openssh_write(const char *filename, sign_key *key,
const void* curve_oid = NULL;
unsigned long pubkey_size = 2*curve_size+1;
unsigned int k_size;
+ int err = 0;
/* version. less than 10 bytes */
buf_incrwritepos(seq_buf,
@@ -1091,7 +1092,7 @@ static int openssh_write(const char *filename, sign_key *key,
buf_incrwritepos(seq_buf,
ber_write_id_len(buf_getwriteptr(seq_buf, 10), 3, 1+pubkey_size, 0));
buf_putbyte(seq_buf, 0);
- int err = ecc_ansi_x963_export(*eck, buf_getwriteptr(seq_buf, pubkey_size), &pubkey_size);
+ err = ecc_ansi_x963_export(*eck, buf_getwriteptr(seq_buf, pubkey_size), &pubkey_size);
if (err != CRYPT_OK) {
dropbear_exit("ECC error");
}
diff --git a/svr-chansession.c b/svr-chansession.c
index 67122bb..5bed8fc 100644
--- a/svr-chansession.c
+++ b/svr-chansession.c
@@ -234,7 +234,7 @@ static int newchansess(struct Channel *channel) {
struct ChanSess *chansess;
- TRACE(("new chansess %p", channel))
+ TRACE(("new chansess %p", (void*)channel))
dropbear_assert(channel->typedata == NULL);
diff --git a/svr-x11fwd.c b/svr-x11fwd.c
index ceca26a..6400c06 100644
--- a/svr-x11fwd.c
+++ b/svr-x11fwd.c
@@ -175,7 +175,7 @@ void x11cleanup(struct ChanSess *chansess) {
m_free(chansess->x11authprot);
m_free(chansess->x11authcookie);
- TRACE(("chansess %p", chansess))
+ TRACE(("chansess %p", (void*)chansess))
if (chansess->x11listener != NULL) {
remove_listener(chansess->x11listener);
chansess->x11listener = NULL;