Some small fixes for unused vars, and old messages
--HG--
extra : convert_revision : 83d9a25ee973ab65fa64dcf8595838b160c21663
diff --git a/dropbearconvert.c b/dropbearconvert.c
index e0d4baf..482a820 100644
--- a/dropbearconvert.c
+++ b/dropbearconvert.c
@@ -47,10 +47,8 @@
"dropbear\n"
"\n"
"Example:\n"
- "dropbearconvert openssh dropbear /etc/ssh/ssh_host_rsa_key /etc/dropbear_rsa_host_key\n"
- "\n"
- "The inputfile and outputfile can be '-' to specify\n"
- "standard input or standard output.\n", progname);
+ "dropbearconvert openssh dropbear /etc/ssh/ssh_host_rsa_key /etc/dropbear_rsa_host_key\n",
+ progname);
}
#if defined(DBMULTI_dropbearconvert) || !defined(DROPBEAR_MULTI)
diff --git a/keyimport.c b/keyimport.c
index 32018b1..9f2305d 100644
--- a/keyimport.c
+++ b/keyimport.c
@@ -108,13 +108,10 @@
static sign_key *dropbear_read(const char* filename) {
buffer * buf = NULL;
- int len, maxlen;
- FILE *fp = NULL;
sign_key *ret = NULL;
int type;
buf = buf_new(MAX_PRIVKEY_SIZE);
- /* buf_readfile knows about "-" */
if (buf_readfile(buf, filename) == DROPBEAR_FAILURE) {
goto error;
}
@@ -163,11 +160,7 @@
buf = buf_new(MAX_PRIVKEY_SIZE);
buf_put_priv_key(buf, key, keytype);
- if (strlen(filename) == 1 && filename[0] == '-') {
- fp = stdout;
- } else {
- fp = fopen(filename, "w");
- }
+ fp = fopen(filename, "w");
if (!fp) {
ret = 0;
goto out;