X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/5c72ca6161da0e7976245222c412d62ebae2e386..e52455b1fd4e5a129cebe653a777b1f421b18b4f:/puttygen.c

diff --git a/puttygen.c b/puttygen.c
index 7c3ef0d6..6d134c43 100644
--- a/puttygen.c
+++ b/puttygen.c
@@ -519,7 +519,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
 
 	    /* Accelerators used: acglops1rbd */
 
-	    ctlposinit(&cp, hwnd, 10, 10, 10);
+	    ctlposinit(&cp, hwnd, 4, 4, 4);
 	    bartitle(&cp, "Public and private key generation for PuTTY",
 		     IDC_TITLE);
 	    beginbox(&cp, "Key", IDC_BOX_KEY);
@@ -530,7 +530,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
 	    progressbar(&cp2, IDC_PROGRESS);
 	    bigeditctrl(&cp,
 			"&Public key for pasting into authorized_keys file:",
-			IDC_PKSTATIC, IDC_KEYDISPLAY, 7);
+			IDC_PKSTATIC, IDC_KEYDISPLAY, 5);
 	    SendDlgItemMessage(hwnd, IDC_KEYDISPLAY, EM_SETREADONLY, 1, 0);
 	    staticedit(&cp, "Key fingerprint:", IDC_FPSTATIC,
 		       IDC_FINGERPRINT, 75);
@@ -561,7 +561,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
 		       IDC_BITSSTATIC, IDC_BITS, 20);
 	    endbox(&cp);
 	}
-	CheckRadioButton(hwnd, IDC_KEYSSH1, IDC_KEYSSH2RSA, IDC_KEYSSH1);
+	CheckRadioButton(hwnd, IDC_KEYSSH1, IDC_KEYSSH2DSA, IDC_KEYSSH1);
 	SetDlgItemInt(hwnd, IDC_BITS, DEFAULT_KEYSIZE, FALSE);
 
 	/*
@@ -683,6 +683,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
 		EnableWindow(GetDlgItem(hwnd, IDC_SAVEPUB), 0);
 		EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH1), 0);
 		EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2RSA), 0);
+		EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2DSA), 0);
 		EnableWindow(GetDlgItem(hwnd, IDC_BITS), 0);
 		state->key_exists = FALSE;
 		SetDlgItemText(hwnd, IDC_GENERATING, entropy_msg);
@@ -868,6 +869,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
 			EnableWindow(GetDlgItem(hwnd, IDC_SAVEPUB), 1);
 			EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH1), 1);
 			EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2RSA), 1);
+			EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2DSA), 1);
 			EnableWindow(GetDlgItem(hwnd, IDC_BITS), 1);
 			/*
 			 * Now update the key controls with all the
@@ -956,6 +958,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
 	EnableWindow(GetDlgItem(hwnd, IDC_SAVEPUB), 1);
 	EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH1), 1);
 	EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2RSA), 1);
+	EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2DSA), 1);
 	EnableWindow(GetDlgItem(hwnd, IDC_BITS), 1);
 	if (state->ssh2) {
 	    if (state->is_dsa) {