X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/7da629c2abc50b798dbb25c2badd0e98ee702f79..HEAD:/cmdgen.c

diff --git a/cmdgen.c b/cmdgen.c
index 9aa585f3..69c0177c 100644
--- a/cmdgen.c
+++ b/cmdgen.c
@@ -102,6 +102,16 @@ void modalfatalbox(char *p, ...)
     cleanup_exit(1);
 }
 
+void nonfatal(char *p, ...)
+{
+    va_list ap;
+    fprintf(stderr, "ERROR: ");
+    va_start(ap, p);
+    vfprintf(stderr, p, ap);
+    va_end(ap);
+    fputc('\n', stderr);
+}
+
 /*
  * Stubs to let everything else link sensibly.
  */
@@ -118,10 +128,7 @@ void sk_cleanup(void)
 
 void showversion(void)
 {
-    char *verstr = dupstr(ver);
-    verstr[0] = tolower(verstr[0]);
-    printf("PuTTYgen %s\n", verstr);
-    sfree(verstr);
+    printf("puttygen: %s\n", ver);
 }
 
 void usage(int standalone)
@@ -257,12 +264,11 @@ static char *blobfp(char *alg, int bits, unsigned char *blob, int bloblen)
 int main(int argc, char **argv)
 {
     char *infile = NULL;
-    Filename infilename;
+    Filename *infilename = NULL, *outfilename = NULL;
     enum { NOKEYGEN, RSA1, RSA2, DSA } keytype = NOKEYGEN;    
     char *outfile = NULL, *outfiletmp = NULL;
-    Filename outfilename;
     enum { PRIVATE, PUBLIC, PUBLICO, FP, OPENSSH, SSHCOM } outtype = PRIVATE;
-    int bits = 1024;
+    int bits = 2048;
     char *comment = NULL, *origcomment = NULL;
     int change_passphrase = FALSE;
     int errs = FALSE, nogo = FALSE;
@@ -316,25 +322,47 @@ int main(int argc, char **argv)
 			    *p++ = '\0';
 			    val = p;
 			} else
-			    val = NULL;
+                            val = NULL;
+
 			if (!strcmp(opt, "-help")) {
-			    help();
-			    nogo = TRUE;
+                            if (val) {
+                                errs = TRUE;
+                                fprintf(stderr, "puttygen: option `-%s'"
+                                        " expects no argument\n", opt);
+                            } else {
+                                help();
+                                nogo = TRUE;
+                            }
 			} else if (!strcmp(opt, "-version")) {
-			    showversion();
-			    nogo = TRUE;
+                            if (val) {
+                                errs = TRUE;
+                                fprintf(stderr, "puttygen: option `-%s'"
+                                        " expects no argument\n", opt);
+                            } else {
+                                showversion();
+                                nogo = TRUE;
+                            }
 			} else if (!strcmp(opt, "-pgpfp")) {
-                            /* support "-pgpfp" for consistency with others */
-                            pgp_fingerprints();
-                            nogo = TRUE;
+                            if (val) {
+                                errs = TRUE;
+                                fprintf(stderr, "puttygen: option `-%s'"
+                                        " expects no argument\n", opt);
+                            } else {
+                                /* support --pgpfp for consistency */
+                                pgp_fingerprints();
+                                nogo = TRUE;
+                            }
                         }
 			/*
-			 * A sample option requiring an argument:
+			 * For long options requiring an argument, add
+			 * code along the lines of
 			 * 
 			 * else if (!strcmp(opt, "-output")) {
-			 *     if (!val)
-			 *         errs = TRUE, error(err_optnoarg, opt);
-			 *     else
+			 *     if (!val) {
+			 *         errs = TRUE;
+                         *         fprintf(stderr, "puttygen: option `-%s'"
+                         *                 " expects an argument\n", opt);
+			 *     } else
 			 *         ofile = val;
 			 * }
 			 */
@@ -514,7 +542,7 @@ int main(int argc, char **argv)
     if (infile) {
 	infilename = filename_from_str(infile);
 
-	intype = key_type(&infilename);
+	intype = key_type(infilename);
 
 	switch (intype) {
 	    /*
@@ -646,7 +674,7 @@ int main(int argc, char **argv)
 	    return 1;
 	}
 	random_add_heavynoise(entropy, bits / 8);
-	memset(entropy, 0, bits/8);
+	smemclr(entropy, bits/8);
 	sfree(entropy);
 
 	if (keytype == DSA) {
@@ -685,11 +713,11 @@ int main(int argc, char **argv)
 	 * Find out whether the input key is encrypted.
 	 */
 	if (intype == SSH_KEYTYPE_SSH1)
-	    encrypted = rsakey_encrypted(&infilename, &origcomment);
+	    encrypted = rsakey_encrypted(infilename, &origcomment);
 	else if (intype == SSH_KEYTYPE_SSH2)
-	    encrypted = ssh2_userkey_encrypted(&infilename, &origcomment);
+	    encrypted = ssh2_userkey_encrypted(infilename, &origcomment);
 	else
-	    encrypted = import_encrypted(&infilename, intype, &origcomment);
+	    encrypted = import_encrypted(infilename, intype, &origcomment);
 
 	/*
 	 * If so, ask for a passphrase.
@@ -699,7 +727,7 @@ int main(int argc, char **argv)
 	    int ret;
 	    p->to_server = FALSE;
 	    p->name = dupstr("SSH key passphrase");
-	    add_prompt(p, dupstr("Enter passphrase to load key: "), FALSE, 512);
+	    add_prompt(p, dupstr("Enter passphrase to load key: "), FALSE);
 	    ret = console_get_userpass_input(p, NULL, 0);
 	    assert(ret >= 0);
 	    if (!ret) {
@@ -724,7 +752,7 @@ int main(int argc, char **argv)
 		unsigned char *blob;
 		int n, l, bloblen;
 
-		ret = rsakey_pubblob(&infilename, &vblob, &bloblen,
+		ret = rsakey_pubblob(infilename, &vblob, &bloblen,
 				     &origcomment, &error);
 		blob = (unsigned char *)vblob;
 
@@ -745,8 +773,11 @@ int main(int argc, char **argv)
 		}
 		ssh1key->comment = dupstr(origcomment);
 		ssh1key->private_exponent = NULL;
+		ssh1key->p = NULL;
+		ssh1key->q = NULL;
+		ssh1key->iqmp = NULL;
 	    } else {
-		ret = loadrsakey(&infilename, ssh1key, passphrase, &error);
+		ret = loadrsakey(infilename, ssh1key, passphrase, &error);
 	    }
 	    if (ret > 0)
 		error = NULL;
@@ -756,15 +787,17 @@ int main(int argc, char **argv)
 
 	  case SSH_KEYTYPE_SSH2:
 	    if (!load_encrypted) {
-		ssh2blob = ssh2_userkey_loadpub(&infilename, &ssh2alg,
+		ssh2blob = ssh2_userkey_loadpub(infilename, &ssh2alg,
 						&ssh2bloblen, NULL, &error);
-		ssh2algf = find_pubkey_alg(ssh2alg);
-		if (ssh2algf)
-		    bits = ssh2algf->pubkey_bits(ssh2blob, ssh2bloblen);
-		else
-		    bits = -1;
+                if (ssh2blob) {
+                    ssh2algf = find_pubkey_alg(ssh2alg);
+                    if (ssh2algf)
+                        bits = ssh2algf->pubkey_bits(ssh2blob, ssh2bloblen);
+                    else
+                        bits = -1;
+                }
 	    } else {
-		ssh2key = ssh2_load_userkey(&infilename, passphrase, &error);
+		ssh2key = ssh2_load_userkey(infilename, passphrase, &error);
 	    }
 	    if ((ssh2key && ssh2key != SSH2_WRONG_PASSPHRASE) || ssh2blob)
 		error = NULL;
@@ -778,7 +811,7 @@ int main(int argc, char **argv)
 
 	  case SSH_KEYTYPE_OPENSSH:
 	  case SSH_KEYTYPE_SSHCOM:
-	    ssh2key = import_ssh2(&infilename, intype, passphrase, &error);
+	    ssh2key = import_ssh2(infilename, intype, passphrase, &error);
 	    if (ssh2key) {
 		if (ssh2key != SSH2_WRONG_PASSPHRASE)
 		    error = NULL;
@@ -824,8 +857,8 @@ int main(int argc, char **argv)
 
 	p->to_server = FALSE;
 	p->name = dupstr("New SSH key passphrase");
-	add_prompt(p, dupstr("Enter passphrase to save key: "), FALSE, 512);
-	add_prompt(p, dupstr("Re-enter passphrase to verify: "), FALSE, 512);
+	add_prompt(p, dupstr("Enter passphrase to save key: "), FALSE);
+	add_prompt(p, dupstr("Re-enter passphrase to verify: "), FALSE);
 	ret = console_get_userpass_input(p, NULL, 0);
 	assert(ret >= 0);
 	if (!ret) {
@@ -839,7 +872,7 @@ int main(int argc, char **argv)
 		return 1;
 	    }
 	    if (passphrase) {
-		memset(passphrase, 0, strlen(passphrase));
+		smemclr(passphrase, strlen(passphrase));
 		sfree(passphrase);
 	    }
 	    passphrase = dupstr(p->prompts[0]->result);
@@ -870,14 +903,14 @@ int main(int argc, char **argv)
       case PRIVATE:
 	if (sshver == 1) {
 	    assert(ssh1key);
-	    ret = saversakey(&outfilename, ssh1key, passphrase);
+	    ret = saversakey(outfilename, ssh1key, passphrase);
 	    if (!ret) {
 		fprintf(stderr, "puttygen: unable to save SSH-1 private key\n");
 		return 1;
 	    }
 	} else {
 	    assert(ssh2key);
-	    ret = ssh2_save_userkey(&outfilename, ssh2key, passphrase);
+	    ret = ssh2_save_userkey(outfilename, ssh2key, passphrase);
  	    if (!ret) {
 		fprintf(stderr, "puttygen: unable to save SSH-2 private key\n");
 		return 1;
@@ -1001,7 +1034,7 @@ int main(int argc, char **argv)
       case SSHCOM:
 	assert(sshver == 2);
 	assert(ssh2key);
-	ret = export_ssh2(&outfilename, outtype, ssh2key, passphrase);
+	ret = export_ssh2(outfilename, outtype, ssh2key, passphrase);
 	if (!ret) {
 	    fprintf(stderr, "puttygen: unable to export key\n");
 	    return 1;
@@ -1014,7 +1047,7 @@ int main(int argc, char **argv)
     }
 
     if (passphrase) {
-	memset(passphrase, 0, strlen(passphrase));
+	smemclr(passphrase, strlen(passphrase));
 	sfree(passphrase);
     }