Pageant interface changes. You can now do `pageant -c command' to

[u/mdw/putty] / puttygen.c

diff --git a/puttygen.c b/puttygen.c
index e93781c..ac5079e 100644 (file)
--- a/puttygen.c
+++ b/puttygen.c
@@ -314,7 +314,7 @@ static void setupbigedit1(HWND hwnd, int id, struct RSAKey *key) {
     buffer = smalloc(strlen(dec1)+strlen(dec2)+
                      strlen(key->comment)+30);
     sprintf(buffer, "%d %s %s %s",
-            ssh1_bignum_bitcount(key->modulus),
+            bignum_bitcount(key->modulus),
             dec1, dec2, key->comment);
     SetDlgItemText(hwnd, id, buffer);
     sfree(dec1);
@@ -325,7 +325,7 @@ static void setupbigedit1(HWND hwnd, int id, struct RSAKey *key) {
 static void setupbigedit2(HWND hwnd, int id, struct ssh2_userkey *key) {
     unsigned char *pub_blob;
     char *buffer, *p;
-    int pub_len, buflen;
+    int pub_len;
     int i;
 
     pub_blob = key->alg->public_blob(key->data, &pub_len);
@@ -530,8 +530,13 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg,
                         sfree(*state->commentptr);
                     *state->commentptr = smalloc(len+1);
                     GetWindowText(editctl, *state->commentptr, len+1);
-                }                
-            }
+                   if (state->ssh2) {
+                       setupbigedit2(hwnd, IDC_KEYDISPLAY, &state->ssh2key);
+                   } else {
+                       setupbigedit1(hwnd, IDC_KEYDISPLAY, &state->key);
+                   }
+               }
+           }
            break;
          case IDC_ABOUT:
            EnableWindow(hwnd, 0);
@@ -789,10 +794,13 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg,
         EnableWindow(GetDlgItem(hwnd, IDC_GENERATE), 1);
         EnableWindow(GetDlgItem(hwnd, IDC_LOAD), 1);
         EnableWindow(GetDlgItem(hwnd, IDC_SAVE), 1);
-       if (state->ssh2)
+       if (state->ssh2) {
+           state->ssh2key.data = &state->key;
+           state->ssh2key.alg = &ssh_rsa;
            state->commentptr = &state->ssh2key.comment;
-       else
+       } else {
            state->commentptr = &state->key.comment;
+       }
         /*
          * Invent a comment for the key. We'll do this by including
          * the date in it. This will be so horrifyingly ugly that