summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2006-03-26 09:26:43 +0000
committerMatt Johnston <matt@ucc.asn.au>2006-03-26 09:26:43 +0000
commitd57a56407b3230672d9320d25d11fc2ec58e359f (patch)
tree5679b7ad4f2d61ac2ae0871832ad06cef9136aa7
parent3cee7b6378c826ba9cf87c830bb199d7a4020a85 (diff)
A few more fixups, make sure that variable declarations are the
first thing in a function --HG-- extra : convert_revision : 5e475ab869513f9ce5baff42838a656f99300487
-rw-r--r--cli-chansession.c4
-rw-r--r--random.c12
2 files changed, 8 insertions, 8 deletions
diff --git a/cli-chansession.c b/cli-chansession.c
index 1dad607..fee8a22 100644
--- a/cli-chansession.c
+++ b/cli-chansession.c
@@ -168,10 +168,10 @@ static void put_termcodes() {
unsigned int value;
unsigned int mapcode;
- TRACE(("enter put_termcodes"))
-
unsigned int bufpos1, bufpos2;
+ TRACE(("enter put_termcodes"))
+
if (tcgetattr(STDIN_FILENO, &tio) == -1) {
dropbear_log(LOG_WARNING, "Failed reading termmodes");
buf_putint(ses.writepayload, 1); /* Just the terminator */
diff --git a/random.c b/random.c
index 5953a43..c836de9 100644
--- a/random.c
+++ b/random.c
@@ -134,7 +134,7 @@ void seedrandom() {
hash_state hs;
/* initialise so that things won't warn about
- * hashing an undefined buffer */
+ * hashing an undefined buffer */
if (!donerandinit) {
m_burn(hashpool, sizeof(hashpool));
}
@@ -157,17 +157,17 @@ void seedrandom() {
* the random pools for fork()ed processes. */
void reseedrandom() {
- pid_t pid;
- struct timeval tv;
+ pid_t pid;
+ hash_state hs;
+ struct timeval tv;
if (!donerandinit) {
dropbear_exit("seedrandom not done");
}
- pid = getpid();
- gettimeofday(&tv, NULL);
+ pid = getpid();
+ gettimeofday(&tv, NULL);
- hash_state hs;
sha1_init(&hs);
sha1_process(&hs, (void*)hashpool, sizeof(hashpool));
sha1_process(&hs, (void*)&pid, sizeof(pid));