Mercurial > dropbear
changeset 87:680a0bc9df0a
Some small fixes for unused vars, and old messages
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 17 Aug 2004 11:14:13 +0000 |
| parents | ace512d2ad5d |
| children | c2ac796b130e |
| files | dropbearconvert.c keyimport.c |
| diffstat | 2 files changed, 3 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/dropbearconvert.c Tue Aug 17 10:40:31 2004 +0000 +++ b/dropbearconvert.c Tue Aug 17 11:14:13 2004 +0000 @@ -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)
--- a/keyimport.c Tue Aug 17 10:40:31 2004 +0000 +++ b/keyimport.c Tue Aug 17 11:14:13 2004 +0000 @@ -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;