diff --git a/dropbearconvert.c b/dropbearconvert.c index e0d4baf56ea73a07a6a0018da5c37156e7a6db35..482a820c9be924af10b5635084581c23ca919d99 100644 --- a/dropbearconvert.c +++ b/dropbearconvert.c @@ -47,10 +47,8 @@ static void printhelp(char * progname) { "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 32018b14ed45dfb9bf4cb82f6ff785a08ce52a0c..9f2305df6c62e890e181a7777071fee2acf8ff69 100644 --- a/keyimport.c +++ b/keyimport.c @@ -108,13 +108,10 @@ int import_write(const char *filename, sign_key *key, char *passphrase, 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 @@ static int dropbear_write(const char*filename, sign_key * key) { 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;