The unified diff between revisions [7f568ec9..] and [83d9a25e..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "dropbearconvert.c"
# from [fb68dcff6c7e4b0e60bbb251390826e4da407b3b]
# to [c0d830b8b0cf134ffcf13d11a69cf7b2bc92ef0c]
#
# patch "keyimport.c"
# from [d968616a841159390ced30293918a5df06acf3ab]
# to [38a61bdea3196db5ff2a57fd389236948142b4ef]
#
============================================================
--- dropbearconvert.c fb68dcff6c7e4b0e60bbb251390826e4da407b3b
+++ dropbearconvert.c c0d830b8b0cf134ffcf13d11a69cf7b2bc92ef0c
@@ -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)
============================================================
--- keyimport.c d968616a841159390ced30293918a5df06acf3ab
+++ keyimport.c 38a61bdea3196db5ff2a57fd389236948142b4ef
@@ -108,13 +108,10 @@ static sign_key *dropbear_read(const cha
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*fil
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;