X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=pageant.c;h=2d9a740236739923800f4d2cfc79a540302c5fdb;hb=510f49e405e71ba5c97875e7a019364e1ef5fac9;hp=3ac9ca71abfad99eae0030353796e765ad0427ab;hpb=f6adc8a9e1821f9f033ee964d486c7c7dd0b4372;p=PuTTY.git diff --git a/pageant.c b/pageant.c index 3ac9ca71..2d9a7402 100644 --- a/pageant.c +++ b/pageant.c @@ -1,126 +1,14 @@ /* - * Pageant: the PuTTY Authentication Agent. + * pageant.c: cross-platform code to implement Pageant. */ -#include +#include #include -#include #include -#include #include "putty.h" #include "ssh.h" -#include "misc.h" -#include "tree234.h" - -#include - -#ifndef NO_SECURITY -#include -#endif - -#define IDI_MAINICON 200 -#define IDI_TRAYICON 201 - -#define WM_XUSER (WM_USER + 0x2000) -#define WM_SYSTRAY (WM_XUSER + 6) -#define WM_SYSTRAY2 (WM_XUSER + 7) - -#define AGENT_COPYDATA_ID 0x804e50ba /* random goop */ - -/* - * FIXME: maybe some day we can sort this out ... - */ -#define AGENT_MAX_MSGLEN 8192 - -#define IDM_CLOSE 0x0010 -#define IDM_VIEWKEYS 0x0020 -#define IDM_ADDKEY 0x0030 -#define IDM_HELP 0x0040 -#define IDM_ABOUT 0x0050 - -#define APPNAME "Pageant" - -extern char ver[]; - -static HINSTANCE instance; -static HWND main_hwnd; -static HWND keylist; -static HWND aboutbox; -static HMENU systray_menu, session_menu; -static int already_running; -static int requested_help; - -char *help_path; -static char *putty_path; - -#define IDM_PUTTY 0x0060 -#define IDM_SESSIONS_BASE 0x1000 -#define IDM_SESSIONS_MAX 0x2000 -#define PUTTY_REGKEY "Software\\SimonTatham\\PuTTY\\Sessions" -#define PUTTY_DEFAULT "Default%20Settings" -static int initial_menuitems_count; - -/* - * Print a modal (Really Bad) message box and perform a fatal exit. - */ -void modalfatalbox(char *fmt, ...) -{ - va_list ap; - char *buf; - - va_start(ap, fmt); - buf = dupvprintf(fmt, ap); - va_end(ap); - MessageBox(main_hwnd, buf, "Pageant Fatal Error", - MB_SYSTEMMODAL | MB_ICONERROR | MB_OK); - sfree(buf); - exit(1); -} - -/* Un-munge session names out of the registry. */ -static void unmungestr(char *in, char *out, int outlen) -{ - while (*in) { - if (*in == '%' && in[1] && in[2]) { - int i, j; - - i = in[1] - '0'; - i -= (i > 9 ? 7 : 0); - j = in[2] - '0'; - j -= (j > 9 ? 7 : 0); - - *out++ = (i << 4) + j; - if (!--outlen) - return; - in += 3; - } else { - *out++ = *in++; - if (!--outlen) - return; - } - } - *out = '\0'; - return; -} - -static tree234 *rsakeys, *ssh2keys; - -static int has_security; -#ifndef NO_SECURITY -typedef DWORD(WINAPI * gsi_fn_t) - (HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, - PSID *, PSID *, PACL *, PACL *, PSECURITY_DESCRIPTOR *); -static gsi_fn_t getsecurityinfo; -#endif - -/* - * Forward references - */ -static void *make_keylist1(int *length); -static void *make_keylist2(int *length); -static void *get_keylist1(void); -static void *get_keylist2(void); +#include "pageant.h" /* * We need this to link with the RSA code, because rsaencrypt() @@ -134,575 +22,220 @@ static void *get_keylist2(void); */ int random_byte(void) { - MessageBox(main_hwnd, "Internal Error", APPNAME, MB_OK | MB_ICONERROR); + modalfatalbox("Internal error: attempt to use random numbers in Pageant"); exit(0); - /* this line can't be reached but it placates MSVC's warnings :-) */ - return 0; + return 0; /* unreachable, but placate optimiser */ } +static int pageant_local = FALSE; + +/* + * rsakeys stores SSH-1 RSA keys. ssh2keys stores all SSH-2 keys. + */ +static tree234 *rsakeys, *ssh2keys; + /* - * Blob structure for passing to the asymmetric SSH2 key compare + * Blob structure for passing to the asymmetric SSH-2 key compare * function, prototyped here. */ struct blob { - unsigned char *blob; + const unsigned char *blob; int len; }; static int cmpkeys_ssh2_asymm(void *av, void *bv); -#define GET_32BIT(cp) \ - (((unsigned long)(unsigned char)(cp)[0] << 24) | \ - ((unsigned long)(unsigned char)(cp)[1] << 16) | \ - ((unsigned long)(unsigned char)(cp)[2] << 8) | \ - ((unsigned long)(unsigned char)(cp)[3])) - -#define PUT_32BIT(cp, value) { \ - (cp)[0] = (unsigned char)((value) >> 24); \ - (cp)[1] = (unsigned char)((value) >> 16); \ - (cp)[2] = (unsigned char)((value) >> 8); \ - (cp)[3] = (unsigned char)(value); } - -#define PASSPHRASE_MAXLEN 512 - -struct PassphraseProcStruct { - char *passphrase; - char *comment; -}; - -static tree234 *passphrases = NULL; - -/* - * After processing a list of filenames, we want to forget the - * passphrases. - */ -static void forget_passphrases(void) -{ - while (count234(passphrases) > 0) { - char *pp = index234(passphrases, 0); - memset(pp, 0, strlen(pp)); - delpos234(passphrases, 0); - free(pp); - } -} - /* - * Dialog-box function for the Licence box. + * Key comparison function for the 2-3-4 tree of RSA keys. */ -static int CALLBACK LicenceProc(HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam) +static int cmpkeys_rsa(void *av, void *bv) { - switch (msg) { - case WM_INITDIALOG: - return 1; - case WM_COMMAND: - switch (LOWORD(wParam)) { - case IDOK: - EndDialog(hwnd, 1); - return 0; - } - return 0; - case WM_CLOSE: - EndDialog(hwnd, 1); - return 0; + struct RSAKey *a = (struct RSAKey *) av; + struct RSAKey *b = (struct RSAKey *) bv; + Bignum am, bm; + int alen, blen; + + am = a->modulus; + bm = b->modulus; + /* + * Compare by length of moduli. + */ + alen = bignum_bitcount(am); + blen = bignum_bitcount(bm); + if (alen > blen) + return +1; + else if (alen < blen) + return -1; + /* + * Now compare by moduli themselves. + */ + alen = (alen + 7) / 8; /* byte count */ + while (alen-- > 0) { + int abyte, bbyte; + abyte = bignum_byte(am, alen); + bbyte = bignum_byte(bm, alen); + if (abyte > bbyte) + return +1; + else if (abyte < bbyte) + return -1; } + /* + * Give up. + */ return 0; } /* - * Dialog-box function for the About box. + * Key comparison function for the 2-3-4 tree of SSH-2 keys. */ -static int CALLBACK AboutProc(HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam) +static int cmpkeys_ssh2(void *av, void *bv) { - switch (msg) { - case WM_INITDIALOG: - SetDlgItemText(hwnd, 100, ver); - return 1; - case WM_COMMAND: - switch (LOWORD(wParam)) { - case IDOK: - aboutbox = NULL; - DestroyWindow(hwnd); - return 0; - case 101: - EnableWindow(hwnd, 0); - DialogBox(instance, MAKEINTRESOURCE(214), hwnd, LicenceProc); - EnableWindow(hwnd, 1); - SetActiveWindow(hwnd); - return 0; + struct ssh2_userkey *a = (struct ssh2_userkey *) av; + struct ssh2_userkey *b = (struct ssh2_userkey *) bv; + int i; + int alen, blen; + unsigned char *ablob, *bblob; + int c; + + /* + * Compare purely by public blob. + */ + ablob = a->alg->public_blob(a->data, &alen); + bblob = b->alg->public_blob(b->data, &blen); + + c = 0; + for (i = 0; i < alen && i < blen; i++) { + if (ablob[i] < bblob[i]) { + c = -1; + break; + } else if (ablob[i] > bblob[i]) { + c = +1; + break; } - return 0; - case WM_CLOSE: - aboutbox = NULL; - DestroyWindow(hwnd); - return 0; } - return 0; -} + if (c == 0 && i < alen) + c = +1; /* a is longer */ + if (c == 0 && i < blen) + c = -1; /* a is longer */ -static HWND passphrase_box; + sfree(ablob); + sfree(bblob); + + return c; +} /* - * Dialog-box function for the passphrase box. + * Key comparison function for looking up a blob in the 2-3-4 tree + * of SSH-2 keys. */ -static int CALLBACK PassphraseProc(HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam) +static int cmpkeys_ssh2_asymm(void *av, void *bv) { - static char *passphrase = NULL; - struct PassphraseProcStruct *p; + struct blob *a = (struct blob *) av; + struct ssh2_userkey *b = (struct ssh2_userkey *) bv; + int i; + int alen, blen; + const unsigned char *ablob; + unsigned char *bblob; + int c; - switch (msg) { - case WM_INITDIALOG: - passphrase_box = hwnd; - /* - * Centre the window. - */ - { /* centre the window */ - RECT rs, rd; - HWND hw; - - hw = GetDesktopWindow(); - if (GetWindowRect(hw, &rs) && GetWindowRect(hwnd, &rd)) - MoveWindow(hwnd, - (rs.right + rs.left + rd.left - rd.right) / 2, - (rs.bottom + rs.top + rd.top - rd.bottom) / 2, - rd.right - rd.left, rd.bottom - rd.top, TRUE); - } + /* + * Compare purely by public blob. + */ + ablob = a->blob; + alen = a->len; + bblob = b->alg->public_blob(b->data, &blen); - SetForegroundWindow(hwnd); - SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, - SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); - p = (struct PassphraseProcStruct *) lParam; - passphrase = p->passphrase; - if (p->comment) - SetDlgItemText(hwnd, 101, p->comment); - *passphrase = 0; - SetDlgItemText(hwnd, 102, passphrase); - return 0; - case WM_COMMAND: - switch (LOWORD(wParam)) { - case IDOK: - if (*passphrase) - EndDialog(hwnd, 1); - else - MessageBeep(0); - return 0; - case IDCANCEL: - EndDialog(hwnd, 0); - return 0; - case 102: /* edit box */ - if ((HIWORD(wParam) == EN_CHANGE) && passphrase) { - GetDlgItemText(hwnd, 102, passphrase, - PASSPHRASE_MAXLEN - 1); - passphrase[PASSPHRASE_MAXLEN - 1] = '\0'; - } - return 0; + c = 0; + for (i = 0; i < alen && i < blen; i++) { + if (ablob[i] < bblob[i]) { + c = -1; + break; + } else if (ablob[i] > bblob[i]) { + c = +1; + break; } - return 0; - case WM_CLOSE: - EndDialog(hwnd, 0); - return 0; } - return 0; -} + if (c == 0 && i < alen) + c = +1; /* a is longer */ + if (c == 0 && i < blen) + c = -1; /* a is longer */ -/* - * Warn about the obsolescent key file format. - */ -void old_keyfile_warning(void) -{ - static const char mbtitle[] = "PuTTY Key File Warning"; - static const char message[] = - "You are loading an SSH 2 private key which has an\n" - "old version of the file format. This means your key\n" - "file is not fully tamperproof. Future versions of\n" - "PuTTY may stop supporting this private key format,\n" - "so we recommend you convert your key to the new\n" - "format.\n" - "\n" - "You can perform this conversion by loading the key\n" - "into PuTTYgen and then saving it again."; - - MessageBox(NULL, message, mbtitle, MB_OK); + sfree(bblob); + + return c; } /* - * Update the visible key list. + * Create an SSH-1 key list in a malloc'ed buffer; return its + * length. */ -static void keylist_update(void) +void *pageant_make_keylist1(int *length) { - struct RSAKey *rkey; - struct ssh2_userkey *skey; - int i; + int i, nkeys, len; + struct RSAKey *key; + unsigned char *blob, *p, *ret; + int bloblen; - if (keylist) { - SendDlgItemMessage(keylist, 100, LB_RESETCONTENT, 0, 0); - for (i = 0; NULL != (rkey = index234(rsakeys, i)); i++) { - char listentry[512], *p; - /* - * Replace two spaces in the fingerprint with tabs, for - * nice alignment in the box. - */ - strcpy(listentry, "ssh1\t"); - p = listentry + strlen(listentry); - rsa_fingerprint(p, sizeof(listentry) - (p - listentry), rkey); - p = strchr(listentry, ' '); - if (p) - *p = '\t'; - p = strchr(listentry, ' '); - if (p) - *p = '\t'; - SendDlgItemMessage(keylist, 100, LB_ADDSTRING, - 0, (LPARAM) listentry); - } - for (i = 0; NULL != (skey = index234(ssh2keys, i)); i++) { - char listentry[512], *p; - int len; - /* - * Replace two spaces in the fingerprint with tabs, for - * nice alignment in the box. - */ - p = skey->alg->fingerprint(skey->data); - strncpy(listentry, p, sizeof(listentry)); - p = strchr(listentry, ' '); - if (p) - *p = '\t'; - p = strchr(listentry, ' '); - if (p) - *p = '\t'; - len = strlen(listentry); - if (len < sizeof(listentry) - 2) { - listentry[len] = '\t'; - strncpy(listentry + len + 1, skey->comment, - sizeof(listentry) - len - 1); - } - SendDlgItemMessage(keylist, 100, LB_ADDSTRING, 0, - (LPARAM) listentry); - } - SendDlgItemMessage(keylist, 100, LB_SETCURSEL, (WPARAM) - 1, 0); + /* + * Count up the number and length of keys we hold. + */ + len = 4; + nkeys = 0; + for (i = 0; NULL != (key = index234(rsakeys, i)); i++) { + nkeys++; + blob = rsa_public_blob(key, &bloblen); + len += bloblen; + sfree(blob); + len += 4 + strlen(key->comment); + } + + /* Allocate the buffer. */ + p = ret = snewn(len, unsigned char); + if (length) *length = len; + + PUT_32BIT(p, nkeys); + p += 4; + for (i = 0; NULL != (key = index234(rsakeys, i)); i++) { + blob = rsa_public_blob(key, &bloblen); + memcpy(p, blob, bloblen); + p += bloblen; + sfree(blob); + PUT_32BIT(p, strlen(key->comment)); + memcpy(p + 4, key->comment, strlen(key->comment)); + p += 4 + strlen(key->comment); } + + assert(p - ret == len); + return ret; } /* - * This function loads a key from a file and adds it. + * Create an SSH-2 key list in a malloc'ed buffer; return its + * length. */ -static void add_keyfile(Filename filename) +void *pageant_make_keylist2(int *length) { - char passphrase[PASSPHRASE_MAXLEN]; - struct RSAKey *rkey = NULL; - struct ssh2_userkey *skey = NULL; - int needs_pass; - int ret; - int attempts; - char *comment; - struct PassphraseProcStruct pps; - int type; - int original_pass; - - type = key_type(&filename); - if (type != SSH_KEYTYPE_SSH1 && type != SSH_KEYTYPE_SSH2) { - char msg[256]; - sprintf(msg, "Couldn't load this key (%s)", key_type_to_str(type)); - MessageBox(NULL, msg, APPNAME, MB_OK | MB_ICONERROR); - return; - } + struct ssh2_userkey *key; + int i, len, nkeys; + unsigned char *blob, *p, *ret; + int bloblen; /* - * See if the key is already loaded (in the primary Pageant, - * which may or may not be us). + * Count up the number and length of keys we hold. */ - { - void *blob; - unsigned char *keylist, *p; - int i, nkeys, bloblen; - - if (type == SSH_KEYTYPE_SSH1) { - if (!rsakey_pubblob(&filename, &blob, &bloblen, NULL)) { - MessageBox(NULL, "Couldn't load private key.", APPNAME, - MB_OK | MB_ICONERROR); - return; - } - keylist = get_keylist1(); - } else { - unsigned char *blob2; - blob = ssh2_userkey_loadpub(&filename, NULL, &bloblen, NULL); - if (!blob) { - MessageBox(NULL, "Couldn't load private key.", APPNAME, - MB_OK | MB_ICONERROR); - return; - } - /* For our purposes we want the blob prefixed with its length */ - blob2 = snewn(bloblen+4, unsigned char); - PUT_32BIT(blob2, bloblen); - memcpy(blob2 + 4, blob, bloblen); - sfree(blob); - blob = blob2; + len = 4; + nkeys = 0; + for (i = 0; NULL != (key = index234(ssh2keys, i)); i++) { + nkeys++; + len += 4; /* length field */ + blob = key->alg->public_blob(key->data, &bloblen); + len += bloblen; + sfree(blob); + len += 4 + strlen(key->comment); + } - keylist = get_keylist2(); - } - if (keylist) { - nkeys = GET_32BIT(keylist); - p = keylist + 4; - - for (i = 0; i < nkeys; i++) { - if (!memcmp(blob, p, bloblen)) { - /* Key is already present; we can now leave. */ - sfree(keylist); - sfree(blob); - return; - } - /* Now skip over public blob */ - if (type == SSH_KEYTYPE_SSH1) - p += rsa_public_blob_len(p); - else - p += 4 + GET_32BIT(p); - /* Now skip over comment field */ - p += 4 + GET_32BIT(p); - } - - sfree(keylist); - } - - sfree(blob); - } - - if (type == SSH_KEYTYPE_SSH1) - needs_pass = rsakey_encrypted(&filename, &comment); - else - needs_pass = ssh2_userkey_encrypted(&filename, &comment); - attempts = 0; - if (type == SSH_KEYTYPE_SSH1) - rkey = snew(struct RSAKey); - pps.passphrase = passphrase; - pps.comment = comment; - original_pass = 0; - do { - if (needs_pass) { - /* try all the remembered passphrases first */ - char *pp = index234(passphrases, attempts); - if(pp) { - strcpy(passphrase, pp); - } else { - int dlgret; - original_pass = 1; - dlgret = DialogBoxParam(instance, MAKEINTRESOURCE(210), - NULL, PassphraseProc, (LPARAM) & pps); - passphrase_box = NULL; - if (!dlgret) { - if (comment) - sfree(comment); - if (type == SSH_KEYTYPE_SSH1) - sfree(rkey); - return; /* operation cancelled */ - } - } - } else - *passphrase = '\0'; - if (type == SSH_KEYTYPE_SSH1) - ret = loadrsakey(&filename, rkey, passphrase, NULL); - else { - skey = ssh2_load_userkey(&filename, passphrase, NULL); - if (skey == SSH2_WRONG_PASSPHRASE) - ret = -1; - else if (!skey) - ret = 0; - else - ret = 1; - } - attempts++; - } while (ret == -1); - - /* if they typed in an ok passphrase, remember it */ - if(original_pass && ret) { - char *pp = dupstr(passphrase); - addpos234(passphrases, pp, 0); - } - - if (comment) - sfree(comment); - if (ret == 0) { - MessageBox(NULL, "Couldn't load private key.", APPNAME, - MB_OK | MB_ICONERROR); - if (type == SSH_KEYTYPE_SSH1) - sfree(rkey); - return; - } - if (type == SSH_KEYTYPE_SSH1) { - if (already_running) { - unsigned char *request, *response; - void *vresponse; - int reqlen, clen, resplen, ret; - - clen = strlen(rkey->comment); - - reqlen = 4 + 1 + /* length, message type */ - 4 + /* bit count */ - ssh1_bignum_length(rkey->modulus) + - ssh1_bignum_length(rkey->exponent) + - ssh1_bignum_length(rkey->private_exponent) + - ssh1_bignum_length(rkey->iqmp) + - ssh1_bignum_length(rkey->p) + - ssh1_bignum_length(rkey->q) + 4 + clen /* comment */ - ; - - request = snewn(reqlen, unsigned char); - - request[4] = SSH1_AGENTC_ADD_RSA_IDENTITY; - reqlen = 5; - PUT_32BIT(request + reqlen, bignum_bitcount(rkey->modulus)); - reqlen += 4; - reqlen += ssh1_write_bignum(request + reqlen, rkey->modulus); - reqlen += ssh1_write_bignum(request + reqlen, rkey->exponent); - reqlen += - ssh1_write_bignum(request + reqlen, - rkey->private_exponent); - reqlen += ssh1_write_bignum(request + reqlen, rkey->iqmp); - reqlen += ssh1_write_bignum(request + reqlen, rkey->p); - reqlen += ssh1_write_bignum(request + reqlen, rkey->q); - PUT_32BIT(request + reqlen, clen); - memcpy(request + reqlen + 4, rkey->comment, clen); - reqlen += 4 + clen; - PUT_32BIT(request, reqlen - 4); - - ret = agent_query(request, reqlen, &vresponse, &resplen, - NULL, NULL); - assert(ret == 1); - response = vresponse; - if (resplen < 5 || response[4] != SSH_AGENT_SUCCESS) - MessageBox(NULL, "The already running Pageant " - "refused to add the key.", APPNAME, - MB_OK | MB_ICONERROR); - - sfree(request); - sfree(response); - } else { - if (add234(rsakeys, rkey) != rkey) - sfree(rkey); /* already present, don't waste RAM */ - } - } else { - if (already_running) { - unsigned char *request, *response; - void *vresponse; - int reqlen, alglen, clen, keybloblen, resplen, ret; - alglen = strlen(skey->alg->name); - clen = strlen(skey->comment); - - keybloblen = skey->alg->openssh_fmtkey(skey->data, NULL, 0); - - reqlen = 4 + 1 + /* length, message type */ - 4 + alglen + /* algorithm name */ - keybloblen + /* key data */ - 4 + clen /* comment */ - ; - - request = snewn(reqlen, unsigned char); - - request[4] = SSH2_AGENTC_ADD_IDENTITY; - reqlen = 5; - PUT_32BIT(request + reqlen, alglen); - reqlen += 4; - memcpy(request + reqlen, skey->alg->name, alglen); - reqlen += alglen; - reqlen += skey->alg->openssh_fmtkey(skey->data, - request + reqlen, - keybloblen); - PUT_32BIT(request + reqlen, clen); - memcpy(request + reqlen + 4, skey->comment, clen); - PUT_32BIT(request, reqlen - 4); - reqlen += clen + 4; - - ret = agent_query(request, reqlen, &vresponse, &resplen, - NULL, NULL); - assert(ret == 1); - response = vresponse; - if (resplen < 5 || response[4] != SSH_AGENT_SUCCESS) - MessageBox(NULL, "The already running Pageant " - "refused to add the key.", APPNAME, - MB_OK | MB_ICONERROR); - - sfree(request); - sfree(response); - } else { - if (add234(ssh2keys, skey) != skey) { - skey->alg->freekey(skey->data); - sfree(skey); /* already present, don't waste RAM */ - } - } - } -} - -/* - * Create an SSH1 key list in a malloc'ed buffer; return its - * length. - */ -static void *make_keylist1(int *length) -{ - int i, nkeys, len; - struct RSAKey *key; - unsigned char *blob, *p, *ret; - int bloblen; - - /* - * Count up the number and length of keys we hold. - */ - len = 4; - nkeys = 0; - for (i = 0; NULL != (key = index234(rsakeys, i)); i++) { - nkeys++; - blob = rsa_public_blob(key, &bloblen); - len += bloblen; - sfree(blob); - len += 4 + strlen(key->comment); - } - - /* Allocate the buffer. */ - p = ret = snewn(len, unsigned char); - if (length) *length = len; - - PUT_32BIT(p, nkeys); - p += 4; - for (i = 0; NULL != (key = index234(rsakeys, i)); i++) { - blob = rsa_public_blob(key, &bloblen); - memcpy(p, blob, bloblen); - p += bloblen; - sfree(blob); - PUT_32BIT(p, strlen(key->comment)); - memcpy(p + 4, key->comment, strlen(key->comment)); - p += 4 + strlen(key->comment); - } - - assert(p - ret == len); - return ret; -} - -/* - * Create an SSH2 key list in a malloc'ed buffer; return its - * length. - */ -static void *make_keylist2(int *length) -{ - struct ssh2_userkey *key; - int i, len, nkeys; - unsigned char *blob, *p, *ret; - int bloblen; - - /* - * Count up the number and length of keys we hold. - */ - len = 4; - nkeys = 0; - for (i = 0; NULL != (key = index234(ssh2keys, i)); i++) { - nkeys++; - len += 4; /* length field */ - blob = key->alg->public_blob(key->data, &bloblen); - len += bloblen; - sfree(blob); - len += 4 + strlen(key->comment); - } - - /* Allocate the buffer. */ - p = ret = snewn(len, unsigned char); - if (length) *length = len; + /* Allocate the buffer. */ + p = ret = snewn(len, unsigned char); + if (length) *length = len; /* * Packet header is the obvious five bytes, plus four @@ -726,84 +259,50 @@ static void *make_keylist2(int *length) return ret; } -/* - * Acquire a keylist1 from the primary Pageant; this means either - * calling make_keylist1 (if that's us) or sending a message to the - * primary Pageant (if it's not). - */ -static void *get_keylist1(void) -{ - void *ret; - - if (already_running) { - unsigned char request[5], *response; - void *vresponse; - int resplen, retval; - request[4] = SSH1_AGENTC_REQUEST_RSA_IDENTITIES; - PUT_32BIT(request, 4); - - retval = agent_query(request, 5, &vresponse, &resplen, NULL, NULL); - assert(retval == 1); - response = vresponse; - if (resplen < 5 || response[4] != SSH1_AGENT_RSA_IDENTITIES_ANSWER) - return NULL; - - ret = snewn(resplen-5, unsigned char); - memcpy(ret, response+5, resplen-5); - sfree(response); - } else { - ret = make_keylist1(NULL); - } - return ret; -} +static void plog(void *logctx, pageant_logfn_t logfn, const char *fmt, ...) +#ifdef __GNUC__ +__attribute__ ((format (printf, 3, 4))) +#endif + ; -/* - * Acquire a keylist2 from the primary Pageant; this means either - * calling make_keylist2 (if that's us) or sending a message to the - * primary Pageant (if it's not). - */ -static void *get_keylist2(void) +static void plog(void *logctx, pageant_logfn_t logfn, const char *fmt, ...) { - void *ret; - - if (already_running) { - unsigned char request[5], *response; - void *vresponse; - int resplen, retval; - - request[4] = SSH2_AGENTC_REQUEST_IDENTITIES; - PUT_32BIT(request, 4); - - retval = agent_query(request, 5, &vresponse, &resplen, NULL, NULL); - assert(retval == 1); - response = vresponse; - if (resplen < 5 || response[4] != SSH2_AGENT_IDENTITIES_ANSWER) - return NULL; - - ret = snewn(resplen-5, unsigned char); - memcpy(ret, response+5, resplen-5); - sfree(response); - } else { - ret = make_keylist2(NULL); + /* + * This is the wrapper that takes a variadic argument list and + * turns it into the va_list that the log function really expects. + * It's safe to call this with logfn==NULL, because we + * double-check that below; but if you're going to do lots of work + * before getting here (such as looping, or hashing things) then + * you should probably check logfn manually before doing that. + */ + if (logfn) { + va_list ap; + va_start(ap, fmt); + logfn(logctx, fmt, ap); + va_end(ap); } - return ret; } -/* - * This is the main agent function that answers messages. - */ -static void answer_msg(void *msg) +void *pageant_handle_msg(const void *msg, int msglen, int *outlen, + void *logctx, pageant_logfn_t logfn) { - unsigned char *p = msg; - unsigned char *ret = msg; + const unsigned char *p = msg; + const unsigned char *msgend; + unsigned char *ret = snewn(AGENT_MAX_MSGLEN, unsigned char); int type; + const char *fail_reason; + + msgend = p + msglen; /* * Get the message type. */ - type = p[4]; + if (msgend < p+1) { + fail_reason = "message contained no type code"; + goto failure; + } + type = *p++; - p += 5; switch (type) { case SSH1_AGENTC_REQUEST_RSA_IDENTITIES: /* @@ -813,14 +312,28 @@ static void answer_msg(void *msg) int len; void *keylist; + plog(logctx, logfn, "request: SSH1_AGENTC_REQUEST_RSA_IDENTITIES"); + ret[4] = SSH1_AGENT_RSA_IDENTITIES_ANSWER; - keylist = make_keylist1(&len); + keylist = pageant_make_keylist1(&len); if (len + 5 > AGENT_MAX_MSGLEN) { sfree(keylist); + fail_reason = "output would exceed max msglen"; goto failure; } PUT_32BIT(ret, len + 1); memcpy(ret + 5, keylist, len); + + plog(logctx, logfn, "reply: SSH1_AGENT_RSA_IDENTITIES_ANSWER"); + if (logfn) { /* skip this loop if not logging */ + int i; + struct RSAKey *rkey; + for (i = 0; NULL != (rkey = pageant_nth_ssh1_key(i)); i++) { + char fingerprint[128]; + rsa_fingerprint(fingerprint, sizeof(fingerprint), rkey); + plog(logctx, logfn, "returned key: %s", fingerprint); + } + } sfree(keylist); } break; @@ -832,14 +345,31 @@ static void answer_msg(void *msg) int len; void *keylist; + plog(logctx, logfn, "request: SSH2_AGENTC_REQUEST_IDENTITIES"); + ret[4] = SSH2_AGENT_IDENTITIES_ANSWER; - keylist = make_keylist2(&len); + keylist = pageant_make_keylist2(&len); if (len + 5 > AGENT_MAX_MSGLEN) { sfree(keylist); + fail_reason = "output would exceed max msglen"; goto failure; } PUT_32BIT(ret, len + 1); memcpy(ret + 5, keylist, len); + + plog(logctx, logfn, "reply: SSH2_AGENT_IDENTITIES_ANSWER"); + if (logfn) { /* skip this loop if not logging */ + int i; + struct ssh2_userkey *skey; + for (i = 0; NULL != (skey = pageant_nth_ssh2_key(i)); i++) { + char *fingerprint = ssh2_fingerprint(skey->alg, + skey->data); + plog(logctx, logfn, "returned key: %s %s", + fingerprint, skey->comment); + sfree(fingerprint); + } + } + sfree(keylist); } break; @@ -856,17 +386,65 @@ static void answer_msg(void *msg) struct MD5Context md5c; int i, len; + plog(logctx, logfn, "request: SSH1_AGENTC_RSA_CHALLENGE"); + p += 4; - p += ssh1_read_bignum(p, &reqkey.exponent); - p += ssh1_read_bignum(p, &reqkey.modulus); - p += ssh1_read_bignum(p, &challenge); - memcpy(response_source + 32, p, 16); - p += 16; - if (GET_32BIT(p) != 1 || - (key = find234(rsakeys, &reqkey, NULL)) == NULL) { - freebn(reqkey.exponent); - freebn(reqkey.modulus); + i = ssh1_read_bignum(p, msgend - p, &reqkey.exponent); + if (i < 0) { + fail_reason = "request truncated before key exponent"; + goto failure; + } + p += i; + i = ssh1_read_bignum(p, msgend - p, &reqkey.modulus); + if (i < 0) { + freebn(reqkey.exponent); + fail_reason = "request truncated before key modulus"; + goto failure; + } + p += i; + i = ssh1_read_bignum(p, msgend - p, &challenge); + if (i < 0) { + freebn(reqkey.exponent); + freebn(reqkey.modulus); freebn(challenge); + fail_reason = "request truncated before challenge"; + goto failure; + } + p += i; + if (msgend < p+16) { + freebn(reqkey.exponent); + freebn(reqkey.modulus); + freebn(challenge); + fail_reason = "request truncated before session id"; + goto failure; + } + memcpy(response_source + 32, p, 16); + p += 16; + if (msgend < p+4) { + freebn(reqkey.exponent); + freebn(reqkey.modulus); + freebn(challenge); + fail_reason = "request truncated before response type"; + goto failure; + } + if (GET_32BIT(p) != 1) { + freebn(reqkey.exponent); + freebn(reqkey.modulus); + freebn(challenge); + fail_reason = "response type other than 1 not supported"; + goto failure; + } + if (logfn) { + char fingerprint[128]; + reqkey.comment = NULL; + rsa_fingerprint(fingerprint, sizeof(fingerprint), &reqkey); + plog(logctx, logfn, "requested key: %s", fingerprint); + } + if ((key = find234(rsakeys, &reqkey, NULL)) == NULL) { + freebn(reqkey.exponent); + freebn(reqkey.modulus); + freebn(challenge); + fail_reason = "key not found"; goto failure; } response = rsadecrypt(challenge, key); @@ -876,7 +454,7 @@ static void answer_msg(void *msg) MD5Init(&md5c); MD5Update(&md5c, response_source, 48); MD5Final(response_md5, &md5c); - memset(response_source, 0, 48); /* burn the evidence */ + smemclr(response_source, 48); /* burn the evidence */ freebn(response); /* and that evidence */ freebn(challenge); /* yes, and that evidence */ freebn(reqkey.exponent); /* and free some memory ... */ @@ -890,6 +468,8 @@ static void answer_msg(void *msg) PUT_32BIT(ret, len - 4); ret[4] = SSH1_AGENT_RSA_RESPONSE; memcpy(ret + 5, response_md5, 16); + + plog(logctx, logfn, "reply: SSH1_AGENT_RSA_RESPONSE"); } break; case SSH2_AGENTC_SIGN_REQUEST: @@ -901,26 +481,55 @@ static void answer_msg(void *msg) { struct ssh2_userkey *key; struct blob b; - unsigned char *data, *signature; + const unsigned char *data; + unsigned char *signature; int datalen, siglen, len; - b.len = GET_32BIT(p); + plog(logctx, logfn, "request: SSH2_AGENTC_SIGN_REQUEST"); + + if (msgend < p+4) { + fail_reason = "request truncated before public key"; + goto failure; + } + b.len = toint(GET_32BIT(p)); + if (b.len < 0 || b.len > msgend - (p+4)) { + fail_reason = "request truncated before public key"; + goto failure; + } p += 4; b.blob = p; p += b.len; - datalen = GET_32BIT(p); + if (msgend < p+4) { + fail_reason = "request truncated before string to sign"; + goto failure; + } + datalen = toint(GET_32BIT(p)); p += 4; + if (datalen < 0 || datalen > msgend - p) { + fail_reason = "request truncated before string to sign"; + goto failure; + } data = p; + if (logfn) { + char *fingerprint = ssh2_fingerprint_blob(b.blob, b.len); + plog(logctx, logfn, "requested key: %s", fingerprint); + sfree(fingerprint); + } key = find234(ssh2keys, &b, cmpkeys_ssh2_asymm); - if (!key) + if (!key) { + fail_reason = "key not found"; goto failure; - signature = key->alg->sign(key->data, data, datalen, &siglen); + } + signature = key->alg->sign(key->data, (const char *)data, + datalen, &siglen); len = 5 + 4 + siglen; PUT_32BIT(ret, len - 4); ret[4] = SSH2_AGENT_SIGN_RESPONSE; PUT_32BIT(ret + 5, siglen); memcpy(ret + 5 + 4, signature, siglen); sfree(signature); + + plog(logctx, logfn, "reply: SSH2_AGENT_SIGN_RESPONSE"); } break; case SSH1_AGENTC_ADD_RSA_IDENTITY: @@ -931,29 +540,102 @@ static void answer_msg(void *msg) { struct RSAKey *key; char *comment; - int commentlen; + int n, commentlen; + + plog(logctx, logfn, "request: SSH1_AGENTC_ADD_RSA_IDENTITY"); + key = snew(struct RSAKey); memset(key, 0, sizeof(struct RSAKey)); - p += makekey(p, key, NULL, 1); - p += makeprivate(p, key); - p += ssh1_read_bignum(p, &key->iqmp); /* p^-1 mod q */ - p += ssh1_read_bignum(p, &key->p); /* p */ - p += ssh1_read_bignum(p, &key->q); /* q */ - commentlen = GET_32BIT(p); + + n = makekey(p, msgend - p, key, NULL, 1); + if (n < 0) { + freersakey(key); + sfree(key); + fail_reason = "request truncated before public key"; + goto failure; + } + p += n; + + n = makeprivate(p, msgend - p, key); + if (n < 0) { + freersakey(key); + sfree(key); + fail_reason = "request truncated before private key"; + goto failure; + } + p += n; + + /* SSH-1 names p and q the other way round, i.e. we have + * the inverse of p mod q and not of q mod p. We swap the + * names, because our internal RSA wants iqmp. */ + + n = ssh1_read_bignum(p, msgend - p, &key->iqmp); /* p^-1 mod q */ + if (n < 0) { + freersakey(key); + sfree(key); + fail_reason = "request truncated before iqmp"; + goto failure; + } + p += n; + + n = ssh1_read_bignum(p, msgend - p, &key->q); /* p */ + if (n < 0) { + freersakey(key); + sfree(key); + fail_reason = "request truncated before p"; + goto failure; + } + p += n; + + n = ssh1_read_bignum(p, msgend - p, &key->p); /* q */ + if (n < 0) { + freersakey(key); + sfree(key); + fail_reason = "request truncated before q"; + goto failure; + } + p += n; + + if (msgend < p+4) { + freersakey(key); + sfree(key); + fail_reason = "request truncated before key comment"; + goto failure; + } + commentlen = toint(GET_32BIT(p)); + + if (commentlen < 0 || commentlen > msgend - p) { + freersakey(key); + sfree(key); + fail_reason = "request truncated before key comment"; + goto failure; + } + comment = snewn(commentlen+1, char); if (comment) { memcpy(comment, p + 4, commentlen); comment[commentlen] = '\0'; key->comment = comment; } - PUT_32BIT(ret, 1); - ret[4] = SSH_AGENT_FAILURE; + + if (logfn) { + char fingerprint[128]; + rsa_fingerprint(fingerprint, sizeof(fingerprint), key); + plog(logctx, logfn, "submitted key: %s", fingerprint); + } + if (add234(rsakeys, key) == key) { keylist_update(); + PUT_32BIT(ret, 1); ret[4] = SSH_AGENT_SUCCESS; + + plog(logctx, logfn, "reply: SSH_AGENT_SUCCESS"); } else { freersakey(key); sfree(key); + + fail_reason = "key already present"; + goto failure; } } break; @@ -964,38 +646,63 @@ static void answer_msg(void *msg) */ { struct ssh2_userkey *key; - char *comment, *alg; + char *comment; + const char *alg; int alglen, commlen; int bloblen; - key = snew(struct ssh2_userkey); + plog(logctx, logfn, "request: SSH2_AGENTC_ADD_IDENTITY"); - alglen = GET_32BIT(p); + if (msgend < p+4) { + fail_reason = "request truncated before key algorithm"; + goto failure; + } + alglen = toint(GET_32BIT(p)); p += 4; - alg = p; + if (alglen < 0 || alglen > msgend - p) { + fail_reason = "request truncated before key algorithm"; + goto failure; + } + alg = (const char *)p; p += alglen; - /* Add further algorithm names here. */ - if (alglen == 7 && !memcmp(alg, "ssh-rsa", 7)) - key->alg = &ssh_rsa; - else if (alglen == 7 && !memcmp(alg, "ssh-dss", 7)) - key->alg = &ssh_dss; - else { + + key = snew(struct ssh2_userkey); + key->alg = find_pubkey_alg_len(alglen, alg); + if (!key->alg) { sfree(key); + fail_reason = "algorithm unknown"; goto failure; } - bloblen = - GET_32BIT((unsigned char *) msg) - (p - - (unsigned char *) msg - - 4); - key->data = key->alg->openssh_createkey(&p, &bloblen); + bloblen = msgend - p; + key->data = key->alg->openssh_createkey(key->alg, &p, &bloblen); if (!key->data) { sfree(key); + fail_reason = "key setup failed"; + goto failure; + } + + /* + * p has been advanced by openssh_createkey, but + * certainly not _beyond_ the end of the buffer. + */ + assert(p <= msgend); + + if (msgend < p+4) { + key->alg->freekey(key->data); + sfree(key); + fail_reason = "request truncated before key comment"; goto failure; } - commlen = GET_32BIT(p); + commlen = toint(GET_32BIT(p)); p += 4; + if (commlen < 0 || commlen > msgend - p) { + key->alg->freekey(key->data); + sfree(key); + fail_reason = "request truncated before key comment"; + goto failure; + } comment = snewn(commlen + 1, char); if (comment) { memcpy(comment, p, commlen); @@ -1003,15 +710,26 @@ static void answer_msg(void *msg) } key->comment = comment; - PUT_32BIT(ret, 1); - ret[4] = SSH_AGENT_FAILURE; + if (logfn) { + char *fingerprint = ssh2_fingerprint(key->alg, key->data); + plog(logctx, logfn, "submitted key: %s %s", + fingerprint, key->comment); + sfree(fingerprint); + } + if (add234(ssh2keys, key) == key) { keylist_update(); + PUT_32BIT(ret, 1); ret[4] = SSH_AGENT_SUCCESS; + + plog(logctx, logfn, "reply: SSH_AGENT_SUCCESS"); } else { key->alg->freekey(key->data); sfree(key->comment); sfree(key); + + fail_reason = "key already present"; + goto failure; } } break; @@ -1023,20 +741,41 @@ static void answer_msg(void *msg) */ { struct RSAKey reqkey, *key; + int n; + + plog(logctx, logfn, "request: SSH1_AGENTC_REMOVE_RSA_IDENTITY"); + + n = makekey(p, msgend - p, &reqkey, NULL, 0); + if (n < 0) { + fail_reason = "request truncated before public key"; + goto failure; + } + + if (logfn) { + char fingerprint[128]; + reqkey.comment = NULL; + rsa_fingerprint(fingerprint, sizeof(fingerprint), &reqkey); + plog(logctx, logfn, "unwanted key: %s", fingerprint); + } - p += makekey(p, &reqkey, NULL, 0); key = find234(rsakeys, &reqkey, NULL); freebn(reqkey.exponent); freebn(reqkey.modulus); PUT_32BIT(ret, 1); - ret[4] = SSH_AGENT_FAILURE; if (key) { + plog(logctx, logfn, "found with comment: %s", key->comment); + del234(rsakeys, key); keylist_update(); freersakey(key); sfree(key); ret[4] = SSH_AGENT_SUCCESS; - } + + plog(logctx, logfn, "reply: SSH_AGENT_SUCCESS"); + } else { + fail_reason = "key not found"; + goto failure; + } } break; case SSH2_AGENTC_REMOVE_IDENTITY: @@ -1049,32 +788,56 @@ static void answer_msg(void *msg) struct ssh2_userkey *key; struct blob b; - b.len = GET_32BIT(p); + plog(logctx, logfn, "request: SSH2_AGENTC_REMOVE_IDENTITY"); + + if (msgend < p+4) { + fail_reason = "request truncated before public key"; + goto failure; + } + b.len = toint(GET_32BIT(p)); p += 4; + + if (b.len < 0 || b.len > msgend - p) { + fail_reason = "request truncated before public key"; + goto failure; + } b.blob = p; p += b.len; + + if (logfn) { + char *fingerprint = ssh2_fingerprint_blob(b.blob, b.len); + plog(logctx, logfn, "unwanted key: %s", fingerprint); + sfree(fingerprint); + } + key = find234(ssh2keys, &b, cmpkeys_ssh2_asymm); - if (!key) + if (!key) { + fail_reason = "key not found"; goto failure; + } + plog(logctx, logfn, "found with comment: %s", key->comment); + + del234(ssh2keys, key); + keylist_update(); + key->alg->freekey(key->data); + sfree(key); PUT_32BIT(ret, 1); - ret[4] = SSH_AGENT_FAILURE; - if (key) { - del234(ssh2keys, key); - keylist_update(); - key->alg->freekey(key->data); - sfree(key); - ret[4] = SSH_AGENT_SUCCESS; - } + ret[4] = SSH_AGENT_SUCCESS; + + plog(logctx, logfn, "reply: SSH_AGENT_SUCCESS"); } break; case SSH1_AGENTC_REMOVE_ALL_RSA_IDENTITIES: /* - * Remove all SSH1 keys. Always returns success. + * Remove all SSH-1 keys. Always returns success. */ { struct RSAKey *rkey; + plog(logctx, logfn, "request:" + " SSH1_AGENTC_REMOVE_ALL_RSA_IDENTITIES"); + while ((rkey = index234(rsakeys, 0)) != NULL) { del234(rsakeys, rkey); freersakey(rkey); @@ -1084,15 +847,19 @@ static void answer_msg(void *msg) PUT_32BIT(ret, 1); ret[4] = SSH_AGENT_SUCCESS; + + plog(logctx, logfn, "reply: SSH_AGENT_SUCCESS"); } break; case SSH2_AGENTC_REMOVE_ALL_IDENTITIES: /* - * Remove all SSH2 keys. Always returns success. + * Remove all SSH-2 keys. Always returns success. */ { struct ssh2_userkey *skey; + plog(logctx, logfn, "request: SSH2_AGENTC_REMOVE_ALL_IDENTITIES"); + while ((skey = index234(ssh2keys, 0)) != NULL) { del234(ssh2keys, skey); skey->alg->freekey(skey->data); @@ -1102,951 +869,967 @@ static void answer_msg(void *msg) PUT_32BIT(ret, 1); ret[4] = SSH_AGENT_SUCCESS; + + plog(logctx, logfn, "reply: SSH_AGENT_SUCCESS"); } break; default: + plog(logctx, logfn, "request: unknown message type %d", type); + + fail_reason = "unrecognised message"; + /* fall through */ failure: /* * Unrecognised message. Return SSH_AGENT_FAILURE. */ PUT_32BIT(ret, 1); ret[4] = SSH_AGENT_FAILURE; + plog(logctx, logfn, "reply: SSH_AGENT_FAILURE (%s)", fail_reason); break; } + + *outlen = 4 + GET_32BIT(ret); + return ret; } -/* - * Key comparison function for the 2-3-4 tree of RSA keys. - */ -static int cmpkeys_rsa(void *av, void *bv) +void *pageant_failure_msg(int *outlen) { - struct RSAKey *a = (struct RSAKey *) av; - struct RSAKey *b = (struct RSAKey *) bv; - Bignum am, bm; - int alen, blen; + unsigned char *ret = snewn(5, unsigned char); + PUT_32BIT(ret, 1); + ret[4] = SSH_AGENT_FAILURE; + *outlen = 5; + return ret; +} - am = a->modulus; - bm = b->modulus; - /* - * Compare by length of moduli. - */ - alen = bignum_bitcount(am); - blen = bignum_bitcount(bm); - if (alen > blen) - return +1; - else if (alen < blen) - return -1; - /* - * Now compare by moduli themselves. - */ - alen = (alen + 7) / 8; /* byte count */ - while (alen-- > 0) { - int abyte, bbyte; - abyte = bignum_byte(am, alen); - bbyte = bignum_byte(bm, alen); - if (abyte > bbyte) - return +1; - else if (abyte < bbyte) - return -1; - } - /* - * Give up. - */ - return 0; +void pageant_init(void) +{ + pageant_local = TRUE; + rsakeys = newtree234(cmpkeys_rsa); + ssh2keys = newtree234(cmpkeys_ssh2); } -/* - * Key comparison function for the 2-3-4 tree of SSH2 keys. - */ -static int cmpkeys_ssh2(void *av, void *bv) +struct RSAKey *pageant_nth_ssh1_key(int i) { - struct ssh2_userkey *a = (struct ssh2_userkey *) av; - struct ssh2_userkey *b = (struct ssh2_userkey *) bv; - int i; - int alen, blen; - unsigned char *ablob, *bblob; - int c; + return index234(rsakeys, i); +} - /* - * Compare purely by public blob. - */ - ablob = a->alg->public_blob(a->data, &alen); - bblob = b->alg->public_blob(b->data, &blen); +struct ssh2_userkey *pageant_nth_ssh2_key(int i) +{ + return index234(ssh2keys, i); +} - c = 0; - for (i = 0; i < alen && i < blen; i++) { - if (ablob[i] < bblob[i]) { - c = -1; - break; - } else if (ablob[i] > bblob[i]) { - c = +1; - break; - } - } - if (c == 0 && i < alen) - c = +1; /* a is longer */ - if (c == 0 && i < blen) - c = -1; /* a is longer */ +int pageant_count_ssh1_keys(void) +{ + return count234(rsakeys); +} - sfree(ablob); - sfree(bblob); +int pageant_count_ssh2_keys(void) +{ + return count234(ssh2keys); +} - return c; +int pageant_add_ssh1_key(struct RSAKey *rkey) +{ + return add234(rsakeys, rkey) == rkey; +} + +int pageant_add_ssh2_key(struct ssh2_userkey *skey) +{ + return add234(ssh2keys, skey) == skey; +} + +int pageant_delete_ssh1_key(struct RSAKey *rkey) +{ + struct RSAKey *deleted = del234(rsakeys, rkey); + if (!deleted) + return FALSE; + assert(deleted == rkey); + return TRUE; +} + +int pageant_delete_ssh2_key(struct ssh2_userkey *skey) +{ + struct ssh2_userkey *deleted = del234(ssh2keys, skey); + if (!deleted) + return FALSE; + assert(deleted == skey); + return TRUE; } +/* ---------------------------------------------------------------------- + * The agent plug. + */ + /* - * Key comparison function for looking up a blob in the 2-3-4 tree - * of SSH2 keys. + * Coroutine macros similar to, but simplified from, those in ssh.c. */ -static int cmpkeys_ssh2_asymm(void *av, void *bv) +#define crBegin(v) { int *crLine = &v; switch(v) { case 0:; +#define crFinish(z) } *crLine = 0; return (z); } +#define crGetChar(c) do \ + { \ + while (len == 0) { \ + *crLine =__LINE__; return 1; case __LINE__:; \ + } \ + len--; \ + (c) = (unsigned char)*data++; \ + } while (0) + +struct pageant_conn_state { + const struct plug_function_table *fn; + /* the above variable absolutely *must* be the first in this structure */ + + Socket connsock; + void *logctx; + pageant_logfn_t logfn; + unsigned char lenbuf[4], pktbuf[AGENT_MAX_MSGLEN]; + unsigned len, got; + int real_packet; + int crLine; /* for coroutine in pageant_conn_receive */ +}; + +static int pageant_conn_closing(Plug plug, const char *error_msg, + int error_code, int calling_back) { - struct blob *a = (struct blob *) av; - struct ssh2_userkey *b = (struct ssh2_userkey *) bv; - int i; - int alen, blen; - unsigned char *ablob, *bblob; - int c; + struct pageant_conn_state *pc = (struct pageant_conn_state *)plug; + if (error_msg) + plog(pc->logctx, pc->logfn, "%p: error: %s", pc, error_msg); + else + plog(pc->logctx, pc->logfn, "%p: connection closed", pc); + sk_close(pc->connsock); + sfree(pc); + return 1; +} + +static void pageant_conn_sent(Plug plug, int bufsize) +{ + /* struct pageant_conn_state *pc = (struct pageant_conn_state *)plug; */ /* - * Compare purely by public blob. + * We do nothing here, because we expect that there won't be a + * need to throttle and unthrottle the connection to an agent - + * clients will typically not send many requests, and will wait + * until they receive each reply before sending a new request. */ - ablob = a->blob; - alen = a->len; - bblob = b->alg->public_blob(b->data, &blen); +} - c = 0; - for (i = 0; i < alen && i < blen; i++) { - if (ablob[i] < bblob[i]) { - c = -1; - break; - } else if (ablob[i] > bblob[i]) { - c = +1; - break; - } +static void pageant_conn_log(void *logctx, const char *fmt, va_list ap) +{ + /* Wrapper on pc->logfn that prefixes the connection identifier */ + struct pageant_conn_state *pc = (struct pageant_conn_state *)logctx; + char *formatted = dupvprintf(fmt, ap); + plog(pc->logctx, pc->logfn, "%p: %s", pc, formatted); + sfree(formatted); +} + +static int pageant_conn_receive(Plug plug, int urgent, char *data, int len) +{ + struct pageant_conn_state *pc = (struct pageant_conn_state *)plug; + char c; + + crBegin(pc->crLine); + + while (len > 0) { + pc->got = 0; + while (pc->got < 4) { + crGetChar(c); + pc->lenbuf[pc->got++] = c; + } + + pc->len = GET_32BIT(pc->lenbuf); + pc->got = 0; + pc->real_packet = (pc->len < AGENT_MAX_MSGLEN-4); + + while (pc->got < pc->len) { + crGetChar(c); + if (pc->real_packet) + pc->pktbuf[pc->got] = c; + pc->got++; + } + + { + void *reply; + int replylen; + + if (pc->real_packet) { + reply = pageant_handle_msg(pc->pktbuf, pc->len, &replylen, pc, + pc->logfn?pageant_conn_log:NULL); + } else { + plog(pc->logctx, pc->logfn, "%p: overlong message (%u)", + pc, pc->len); + plog(pc->logctx, pc->logfn, "%p: reply: SSH_AGENT_FAILURE " + "(message too long)", pc); + reply = pageant_failure_msg(&replylen); + } + sk_write(pc->connsock, reply, replylen); + smemclr(reply, replylen); + } } - if (c == 0 && i < alen) - c = +1; /* a is longer */ - if (c == 0 && i < blen) - c = -1; /* a is longer */ - sfree(bblob); + crFinish(1); +} - return c; +struct pageant_listen_state { + const struct plug_function_table *fn; + /* the above variable absolutely *must* be the first in this structure */ + + Socket listensock; + void *logctx; + pageant_logfn_t logfn; +}; + +static int pageant_listen_closing(Plug plug, const char *error_msg, + int error_code, int calling_back) +{ + struct pageant_listen_state *pl = (struct pageant_listen_state *)plug; + if (error_msg) + plog(pl->logctx, pl->logfn, "listening socket: error: %s", error_msg); + sk_close(pl->listensock); + pl->listensock = NULL; + return 1; } -/* - * Prompt for a key file to add, and add it. - */ -static void prompt_add_keyfile(void) +static int pageant_listen_accepting(Plug plug, + accept_fn_t constructor, accept_ctx_t ctx) { - OPENFILENAME of; - char filename[FILENAME_MAX]; - char *filelist = snewn(8192, char); - char *filewalker; - int n, dirlen; - - memset(&of, 0, sizeof(of)); -#ifdef OPENFILENAME_SIZE_VERSION_400 - of.lStructSize = OPENFILENAME_SIZE_VERSION_400; -#else - of.lStructSize = sizeof(of); -#endif - of.hwndOwner = main_hwnd; - of.lpstrFilter = "PuTTY Private Key Files (*.ppk)\0*.ppk\0" - "All Files (*.*)\0*\0\0\0"; - of.lpstrCustomFilter = NULL; - of.nFilterIndex = 1; - of.lpstrFile = filelist; - *filelist = '\0'; - of.nMaxFile = FILENAME_MAX; - of.lpstrFileTitle = NULL; - of.lpstrInitialDir = NULL; - of.lpstrTitle = "Select Private Key File"; - of.Flags = OFN_ALLOWMULTISELECT | OFN_EXPLORER; - if (GetOpenFileName(&of)) { - if(strlen(filelist) > of.nFileOffset) - /* Only one filename returned? */ - add_keyfile(filename_from_str(filelist)); - else { - /* we are returned a bunch of strings, end to - * end. first string is the directory, the - * rest the filenames. terminated with an - * empty string. - */ - filewalker = filelist; - dirlen = strlen(filewalker); - if(dirlen > FILENAME_MAX - 8) return; - memcpy(filename, filewalker, dirlen); - - filewalker += dirlen + 1; - filename[dirlen++] = '\\'; - - /* then go over names one by one */ - for(;;) { - n = strlen(filewalker) + 1; - /* end of the list */ - if(n == 1) - break; - /* too big, shouldn't happen */ - if(n + dirlen > FILENAME_MAX) - break; - - memcpy(filename + dirlen, filewalker, n); - filewalker += n; - - add_keyfile(filename_from_str(filename)); - } - } + static const struct plug_function_table connection_fn_table = { + NULL, /* no log function, because that's for outgoing connections */ + pageant_conn_closing, + pageant_conn_receive, + pageant_conn_sent, + NULL /* no accepting function, because we've already done it */ + }; + struct pageant_listen_state *pl = (struct pageant_listen_state *)plug; + struct pageant_conn_state *pc; + const char *err; + char *peerinfo; + + pc = snew(struct pageant_conn_state); + pc->fn = &connection_fn_table; + pc->logfn = pl->logfn; + pc->logctx = pl->logctx; + pc->crLine = 0; + + pc->connsock = constructor(ctx, (Plug) pc); + if ((err = sk_socket_error(pc->connsock)) != NULL) { + sk_close(pc->connsock); + sfree(pc); + return TRUE; + } - keylist_update(); - forget_passphrases(); + sk_set_frozen(pc->connsock, 0); + + peerinfo = sk_peer_info(pc->connsock); + if (peerinfo) { + plog(pl->logctx, pl->logfn, "%p: new connection from %s", + pc, peerinfo); + } else { + plog(pl->logctx, pl->logfn, "%p: new connection", pc); } - sfree(filelist); + + return 0; +} + +struct pageant_listen_state *pageant_listener_new(void) +{ + static const struct plug_function_table listener_fn_table = { + NULL, /* no log function, because that's for outgoing connections */ + pageant_listen_closing, + NULL, /* no receive function on a listening socket */ + NULL, /* no sent function on a listening socket */ + pageant_listen_accepting + }; + + struct pageant_listen_state *pl = snew(struct pageant_listen_state); + pl->fn = &listener_fn_table; + pl->logctx = NULL; + pl->logfn = NULL; + pl->listensock = NULL; + return pl; +} + +void pageant_listener_got_socket(struct pageant_listen_state *pl, Socket sock) +{ + pl->listensock = sock; +} + +void pageant_listener_set_logfn(struct pageant_listen_state *pl, + void *logctx, pageant_logfn_t logfn) +{ + pl->logctx = logctx; + pl->logfn = logfn; +} + +void pageant_listener_free(struct pageant_listen_state *pl) +{ + if (pl->listensock) + sk_close(pl->listensock); + sfree(pl); } +/* ---------------------------------------------------------------------- + * Code to perform agent operations either as a client, or within the + * same process as the running agent. + */ + +static tree234 *passphrases = NULL; + /* - * Dialog-box function for the key list box. + * After processing a list of filenames, we want to forget the + * passphrases. */ -static int CALLBACK KeyListProc(HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam) +void pageant_forget_passphrases(void) { - struct RSAKey *rkey; - struct ssh2_userkey *skey; + if (!passphrases) /* in case we never set it up at all */ + return; - switch (msg) { - case WM_INITDIALOG: - /* - * Centre the window. - */ - { /* centre the window */ - RECT rs, rd; - HWND hw; - - hw = GetDesktopWindow(); - if (GetWindowRect(hw, &rs) && GetWindowRect(hwnd, &rd)) - MoveWindow(hwnd, - (rs.right + rs.left + rd.left - rd.right) / 2, - (rs.bottom + rs.top + rd.top - rd.bottom) / 2, - rd.right - rd.left, rd.bottom - rd.top, TRUE); - } + while (count234(passphrases) > 0) { + char *pp = index234(passphrases, 0); + smemclr(pp, strlen(pp)); + delpos234(passphrases, 0); + free(pp); + } +} - if (help_path) - SetWindowLong(hwnd, GWL_EXSTYLE, - GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_CONTEXTHELP); - else { - HWND item = GetDlgItem(hwnd, 103); /* the Help button */ - if (item) - DestroyWindow(item); - } - requested_help = FALSE; +void *pageant_get_keylist1(int *length) +{ + void *ret; - keylist = hwnd; - { - static int tabs[] = { 35, 60, 210 }; - SendDlgItemMessage(hwnd, 100, LB_SETTABSTOPS, - sizeof(tabs) / sizeof(*tabs), - (LPARAM) tabs); - } - keylist_update(); - return 0; - case WM_COMMAND: - switch (LOWORD(wParam)) { - case IDOK: - case IDCANCEL: - keylist = NULL; - DestroyWindow(hwnd); - return 0; - case 101: /* add key */ - if (HIWORD(wParam) == BN_CLICKED || - HIWORD(wParam) == BN_DOUBLECLICKED) { - if (passphrase_box) { - MessageBeep(MB_ICONERROR); - SetForegroundWindow(passphrase_box); - break; - } - prompt_add_keyfile(); - } - return 0; - case 102: /* remove key */ - if (HIWORD(wParam) == BN_CLICKED || - HIWORD(wParam) == BN_DOUBLECLICKED) { - int i; - int rCount, sCount; - int *selectedArray; - - /* our counter within the array of selected items */ - int itemNum; - - /* get the number of items selected in the list */ - int numSelected = - SendDlgItemMessage(hwnd, 100, LB_GETSELCOUNT, 0, 0); - - /* none selected? that was silly */ - if (numSelected == 0) { - MessageBeep(0); - break; - } + if (!pageant_local) { + unsigned char request[5], *response; + void *vresponse; + int resplen; - /* get item indices in an array */ - selectedArray = snewn(numSelected, int); - SendDlgItemMessage(hwnd, 100, LB_GETSELITEMS, - numSelected, (WPARAM)selectedArray); - - itemNum = numSelected - 1; - rCount = count234(rsakeys); - sCount = count234(ssh2keys); - - /* go through the non-rsakeys until we've covered them all, - * and/or we're out of selected items to check. note that - * we go *backwards*, to avoid complications from deleting - * things hence altering the offset of subsequent items - */ - for (i = sCount - 1; (itemNum >= 0) && (i >= 0); i--) { - skey = index234(ssh2keys, i); - - if (selectedArray[itemNum] == rCount + i) { - del234(ssh2keys, skey); - skey->alg->freekey(skey->data); - sfree(skey); - itemNum--; - } - } - - /* do the same for the rsa keys */ - for (i = rCount - 1; (itemNum >= 0) && (i >= 0); i--) { - rkey = index234(rsakeys, i); - - if(selectedArray[itemNum] == i) { - del234(rsakeys, rkey); - freersakey(rkey); - sfree(rkey); - itemNum--; - } - } + request[4] = SSH1_AGENTC_REQUEST_RSA_IDENTITIES; + PUT_32BIT(request, 1); - sfree(selectedArray); - keylist_update(); - } - return 0; - case 103: /* help */ - if (HIWORD(wParam) == BN_CLICKED || - HIWORD(wParam) == BN_DOUBLECLICKED) { - if (help_path) { - WinHelp(main_hwnd, help_path, HELP_COMMAND, - (DWORD)"JI(`',`pageant.general')"); - requested_help = TRUE; - } - } - return 0; - } - return 0; - case WM_HELP: - if (help_path) { - int id = ((LPHELPINFO)lParam)->iCtrlId; - char *cmd = NULL; - switch (id) { - case 100: cmd = "JI(`',`pageant.keylist')"; break; - case 101: cmd = "JI(`',`pageant.addkey')"; break; - case 102: cmd = "JI(`',`pageant.remkey')"; break; - } - if (cmd) { - WinHelp(main_hwnd, help_path, HELP_COMMAND, (DWORD)cmd); - requested_help = TRUE; - } else { - MessageBeep(0); - } + agent_query_synchronous(request, 5, &vresponse, &resplen); + response = vresponse; + if (resplen < 5 || response[4] != SSH1_AGENT_RSA_IDENTITIES_ANSWER) { + sfree(response); + return NULL; } - break; - case WM_CLOSE: - keylist = NULL; - DestroyWindow(hwnd); - return 0; + + ret = snewn(resplen-5, unsigned char); + memcpy(ret, response+5, resplen-5); + sfree(response); + + if (length) + *length = resplen-5; + } else { + ret = pageant_make_keylist1(length); } - return 0; + return ret; } -/* Set up a system tray icon */ -static BOOL AddTrayIcon(HWND hwnd) +void *pageant_get_keylist2(int *length) { - BOOL res; - NOTIFYICONDATA tnid; - HICON hicon; + void *ret; -#ifdef NIM_SETVERSION - tnid.uVersion = 0; - res = Shell_NotifyIcon(NIM_SETVERSION, &tnid); -#endif + if (!pageant_local) { + unsigned char request[5], *response; + void *vresponse; + int resplen; - tnid.cbSize = sizeof(NOTIFYICONDATA); - tnid.hWnd = hwnd; - tnid.uID = 1; /* unique within this systray use */ - tnid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP; - tnid.uCallbackMessage = WM_SYSTRAY; - tnid.hIcon = hicon = LoadIcon(instance, MAKEINTRESOURCE(201)); - strcpy(tnid.szTip, "Pageant (PuTTY authentication agent)"); + request[4] = SSH2_AGENTC_REQUEST_IDENTITIES; + PUT_32BIT(request, 1); + + agent_query_synchronous(request, 5, &vresponse, &resplen); + response = vresponse; + if (resplen < 5 || response[4] != SSH2_AGENT_IDENTITIES_ANSWER) { + sfree(response); + return NULL; + } - res = Shell_NotifyIcon(NIM_ADD, &tnid); + ret = snewn(resplen-5, unsigned char); + memcpy(ret, response+5, resplen-5); + sfree(response); - if (hicon) DestroyIcon(hicon); - - return res; + if (length) + *length = resplen-5; + } else { + ret = pageant_make_keylist2(length); + } + return ret; } -/* Update the saved-sessions menu. */ -static void update_sessions(void) +int pageant_add_keyfile(Filename *filename, const char *passphrase, + char **retstr) { - int num_entries; - HKEY hkey; - TCHAR buf[MAX_PATH + 1]; - MENUITEMINFO mii; - - int index_key, index_menu; - - if (!putty_path) - return; - - if(ERROR_SUCCESS != RegOpenKey(HKEY_CURRENT_USER, PUTTY_REGKEY, &hkey)) - return; - - for(num_entries = GetMenuItemCount(session_menu); - num_entries > initial_menuitems_count; - num_entries--) - RemoveMenu(session_menu, 0, MF_BYPOSITION); - - index_key = 0; - index_menu = 0; - - while(ERROR_SUCCESS == RegEnumKey(hkey, index_key, buf, MAX_PATH)) { - TCHAR session_name[MAX_PATH + 1]; - unmungestr(buf, session_name, MAX_PATH); - if(strcmp(buf, PUTTY_DEFAULT) != 0) { - memset(&mii, 0, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_TYPE | MIIM_STATE | MIIM_ID; - mii.fType = MFT_STRING; - mii.fState = MFS_ENABLED; - mii.wID = (index_menu * 16) + IDM_SESSIONS_BASE; - mii.dwTypeData = session_name; - InsertMenuItem(session_menu, index_menu, TRUE, &mii); - index_menu++; - } - index_key++; + struct RSAKey *rkey = NULL; + struct ssh2_userkey *skey = NULL; + int needs_pass; + int ret; + int attempts; + char *comment; + const char *this_passphrase; + const char *error = NULL; + int type; + + if (!passphrases) { + passphrases = newtree234(NULL); } - RegCloseKey(hkey); + *retstr = NULL; - if(index_menu == 0) { - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_TYPE | MIIM_STATE; - mii.fType = MFT_STRING; - mii.fState = MFS_GRAYED; - mii.dwTypeData = _T("(No sessions)"); - InsertMenuItem(session_menu, index_menu, TRUE, &mii); + type = key_type(filename); + if (type != SSH_KEYTYPE_SSH1 && type != SSH_KEYTYPE_SSH2) { + *retstr = dupprintf("Couldn't load this key (%s)", + key_type_to_str(type)); + return PAGEANT_ACTION_FAILURE; } -} -static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, - WPARAM wParam, LPARAM lParam) -{ - int ret; - static int menuinprogress; - static UINT msgTaskbarCreated = 0; + /* + * See if the key is already loaded (in the primary Pageant, + * which may or may not be us). + */ + { + void *blob; + unsigned char *keylist, *p; + int i, nkeys, bloblen, keylistlen; - switch (message) { - case WM_CREATE: - msgTaskbarCreated = RegisterWindowMessage(_T("TaskbarCreated")); - break; - default: - if (message==msgTaskbarCreated) { - /* - * Explorer has been restarted, so the tray icon will - * have been lost. - */ - AddTrayIcon(hwnd); - } - break; - - case WM_SYSTRAY: - if (lParam == WM_RBUTTONUP) { - POINT cursorpos; - GetCursorPos(&cursorpos); - PostMessage(hwnd, WM_SYSTRAY2, cursorpos.x, cursorpos.y); - } else if (lParam == WM_LBUTTONDBLCLK) { - /* Equivalent to IDM_VIEWKEYS. */ - PostMessage(hwnd, WM_COMMAND, IDM_VIEWKEYS, 0); - } - break; - case WM_SYSTRAY2: - if (!menuinprogress) { - menuinprogress = 1; - update_sessions(); - SetForegroundWindow(hwnd); - ret = TrackPopupMenu(systray_menu, - TPM_RIGHTALIGN | TPM_BOTTOMALIGN | - TPM_RIGHTBUTTON, - wParam, lParam, 0, hwnd, NULL); - menuinprogress = 0; - } - break; - case WM_COMMAND: - case WM_SYSCOMMAND: - switch (wParam & ~0xF) { /* low 4 bits reserved to Windows */ - case IDM_PUTTY: - if((int)ShellExecute(hwnd, NULL, putty_path, _T(""), _T(""), - SW_SHOW) <= 32) { - MessageBox(NULL, "Unable to execute PuTTY!", - "Error", MB_OK | MB_ICONERROR); + if (type == SSH_KEYTYPE_SSH1) { + if (!rsakey_pubblob(filename, &blob, &bloblen, NULL, &error)) { + *retstr = dupprintf("Couldn't load private key (%s)", error); + return PAGEANT_ACTION_FAILURE; } - break; - case IDM_CLOSE: - if (passphrase_box) - SendMessage(passphrase_box, WM_CLOSE, 0, 0); - SendMessage(hwnd, WM_CLOSE, 0, 0); - break; - case IDM_VIEWKEYS: - if (!keylist) { - keylist = CreateDialog(instance, MAKEINTRESOURCE(211), - NULL, KeyListProc); - ShowWindow(keylist, SW_SHOWNORMAL); + keylist = pageant_get_keylist1(&keylistlen); + } else { + unsigned char *blob2; + blob = ssh2_userkey_loadpub(filename, NULL, &bloblen, + NULL, &error); + if (!blob) { + *retstr = dupprintf("Couldn't load private key (%s)", error); + return PAGEANT_ACTION_FAILURE; } - /* - * Sometimes the window comes up minimised / hidden for - * no obvious reason. Prevent this. This also brings it - * to the front if it's already present (the user - * selected View Keys because they wanted to _see_ the - * thing). - */ - SetForegroundWindow(keylist); - SetWindowPos(keylist, HWND_TOP, 0, 0, 0, 0, - SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); - break; - case IDM_ADDKEY: - if (passphrase_box) { - MessageBeep(MB_ICONERROR); - SetForegroundWindow(passphrase_box); - break; + /* For our purposes we want the blob prefixed with its length */ + blob2 = snewn(bloblen+4, unsigned char); + PUT_32BIT(blob2, bloblen); + memcpy(blob2 + 4, blob, bloblen); + sfree(blob); + blob = blob2; + + keylist = pageant_get_keylist2(&keylistlen); + } + if (keylist) { + if (keylistlen < 4) { + *retstr = dupstr("Received broken key list from agent"); + sfree(keylist); + sfree(blob); + return PAGEANT_ACTION_FAILURE; } - prompt_add_keyfile(); - break; - case IDM_ABOUT: - if (!aboutbox) { - aboutbox = CreateDialog(instance, MAKEINTRESOURCE(213), - NULL, AboutProc); - ShowWindow(aboutbox, SW_SHOWNORMAL); - /* - * Sometimes the window comes up minimised / hidden - * for no obvious reason. Prevent this. - */ - SetForegroundWindow(aboutbox); - SetWindowPos(aboutbox, HWND_TOP, 0, 0, 0, 0, - SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); + nkeys = toint(GET_32BIT(keylist)); + if (nkeys < 0) { + *retstr = dupstr("Received broken key list from agent"); + sfree(keylist); + sfree(blob); + return PAGEANT_ACTION_FAILURE; } - break; - case IDM_HELP: - if (help_path) { - WinHelp(main_hwnd, help_path, HELP_COMMAND, - (DWORD)"JI(`',`pageant.general')"); - requested_help = TRUE; - } - break; - default: - { - if(wParam >= IDM_SESSIONS_BASE && wParam <= IDM_SESSIONS_MAX) { - MENUITEMINFO mii; - TCHAR buf[MAX_PATH + 1]; - TCHAR param[MAX_PATH + 1]; - memset(&mii, 0, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_TYPE; - mii.cch = MAX_PATH; - mii.dwTypeData = buf; - GetMenuItemInfo(session_menu, wParam, FALSE, &mii); - strcpy(param, "@"); - strcat(param, mii.dwTypeData); - if((int)ShellExecute(hwnd, NULL, putty_path, param, - _T(""), SW_SHOW) <= 32) { - MessageBox(NULL, "Unable to execute PuTTY!", "Error", - MB_OK | MB_ICONERROR); - } + p = keylist + 4; + keylistlen -= 4; + + for (i = 0; i < nkeys; i++) { + if (!memcmp(blob, p, bloblen)) { + /* Key is already present; we can now leave. */ + sfree(keylist); + sfree(blob); + return PAGEANT_ACTION_OK; } - } - break; - } - break; - case WM_DESTROY: - if (requested_help) { - WinHelp(main_hwnd, help_path, HELP_QUIT, 0); - requested_help = FALSE; - } - PostQuitMessage(0); - return 0; - case WM_COPYDATA: - { - COPYDATASTRUCT *cds; - char *mapname; - void *p; - HANDLE filemap; -#ifndef NO_SECURITY - HANDLE proc; - PSID mapowner, procowner; - PSECURITY_DESCRIPTOR psd1 = NULL, psd2 = NULL; -#endif - int ret = 0; - - cds = (COPYDATASTRUCT *) lParam; - if (cds->dwData != AGENT_COPYDATA_ID) - return 0; /* not our message, mate */ - mapname = (char *) cds->lpData; - if (mapname[cds->cbData - 1] != '\0') - return 0; /* failure to be ASCIZ! */ -#ifdef DEBUG_IPC - debug(("mapname is :%s:\n", mapname)); -#endif - filemap = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, mapname); -#ifdef DEBUG_IPC - debug(("filemap is %p\n", filemap)); -#endif - if (filemap != NULL && filemap != INVALID_HANDLE_VALUE) { -#ifndef NO_SECURITY - int rc; - if (has_security) { - if ((proc = OpenProcess(MAXIMUM_ALLOWED, FALSE, - GetCurrentProcessId())) == - NULL) { -#ifdef DEBUG_IPC - debug(("couldn't get handle for process\n")); -#endif - return 0; + /* Now skip over public blob */ + if (type == SSH_KEYTYPE_SSH1) { + int n = rsa_public_blob_len(p, keylistlen); + if (n < 0) { + *retstr = dupstr("Received broken key list from agent"); + sfree(keylist); + sfree(blob); + return PAGEANT_ACTION_FAILURE; } - if (getsecurityinfo(proc, SE_KERNEL_OBJECT, - OWNER_SECURITY_INFORMATION, - &procowner, NULL, NULL, NULL, - &psd2) != ERROR_SUCCESS) { -#ifdef DEBUG_IPC - debug(("couldn't get owner info for process\n")); -#endif - CloseHandle(proc); - return 0; /* unable to get security info */ + p += n; + keylistlen -= n; + } else { + int n; + if (keylistlen < 4) { + *retstr = dupstr("Received broken key list from agent"); + sfree(keylist); + sfree(blob); + return PAGEANT_ACTION_FAILURE; } - CloseHandle(proc); - if ((rc = getsecurityinfo(filemap, SE_KERNEL_OBJECT, - OWNER_SECURITY_INFORMATION, - &mapowner, NULL, NULL, NULL, - &psd1) != ERROR_SUCCESS)) { -#ifdef DEBUG_IPC - debug( - ("couldn't get owner info for filemap: %d\n", - rc)); -#endif - return 0; + n = GET_32BIT(p); + p += 4; + keylistlen -= 4; + + if (n < 0 || n > keylistlen) { + *retstr = dupstr("Received broken key list from agent"); + sfree(keylist); + sfree(blob); + return PAGEANT_ACTION_FAILURE; } -#ifdef DEBUG_IPC - debug(("got security stuff\n")); -#endif - if (!EqualSid(mapowner, procowner)) - return 0; /* security ID mismatch! */ -#ifdef DEBUG_IPC - debug(("security stuff matched\n")); -#endif - LocalFree(psd1); - LocalFree(psd2); - } else { -#ifdef DEBUG_IPC - debug(("security APIs not present\n")); -#endif + p += n; + keylistlen -= n; } -#endif - p = MapViewOfFile(filemap, FILE_MAP_WRITE, 0, 0, 0); -#ifdef DEBUG_IPC - debug(("p is %p\n", p)); + /* Now skip over comment field */ { - int i; - for (i = 0; i < 5; i++) - debug( - ("p[%d]=%02x\n", i, - ((unsigned char *) p)[i]));} -#endif - answer_msg(p); - ret = 1; - UnmapViewOfFile(p); + int n; + if (keylistlen < 4) { + *retstr = dupstr("Received broken key list from agent"); + sfree(keylist); + sfree(blob); + return PAGEANT_ACTION_FAILURE; + } + n = GET_32BIT(p); + p += 4; + keylistlen -= 4; + + if (n < 0 || n > keylistlen) { + *retstr = dupstr("Received broken key list from agent"); + sfree(keylist); + sfree(blob); + return PAGEANT_ACTION_FAILURE; + } + p += n; + keylistlen -= n; + } } - CloseHandle(filemap); - return ret; - } - } - return DefWindowProc(hwnd, message, wParam, lParam); -} + sfree(keylist); + } -/* - * Fork and Exec the command in cmdline. [DBW] - */ -void spawn_cmd(char *cmdline, char * args, int show) -{ - if (ShellExecute(NULL, _T("open"), cmdline, - args, NULL, show) <= (HINSTANCE) 32) { - char *msg; - msg = dupprintf("Failed to run \"%.100s\", Error: %d", cmdline, - (int)GetLastError()); - MessageBox(NULL, msg, APPNAME, MB_OK | MB_ICONEXCLAMATION); - sfree(msg); + sfree(blob); } -} - -/* - * This is a can't-happen stub, since Pageant never makes - * asynchronous agent requests. - */ -void agent_schedule_callback(void (*callback)(void *, void *, int), - void *callback_ctx, void *data, int len) -{ - assert(!"We shouldn't get here"); -} -void cleanup_exit(int code) { exit(code); } - -int flags = FLAG_SYNCAGENT; - -int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) -{ - WNDCLASS wndclass; - MSG msg; - HMODULE advapi; - char *command = NULL; - int added_keys = 0; - int argc, i; - char **argv, **argstart; + error = NULL; + if (type == SSH_KEYTYPE_SSH1) + needs_pass = rsakey_encrypted(filename, &comment); + else + needs_pass = ssh2_userkey_encrypted(filename, &comment); + attempts = 0; + if (type == SSH_KEYTYPE_SSH1) + rkey = snew(struct RSAKey); /* - * Determine whether we're an NT system (should have security - * APIs) or a non-NT system (don't do security). + * Loop round repeatedly trying to load the key, until we either + * succeed, fail for some serious reason, or run out of + * passphrases to try. */ - if (!init_winver()) - { - modalfatalbox("Windows refuses to report a version"); - } - if (osVersion.dwPlatformId == VER_PLATFORM_WIN32_NT) { - has_security = TRUE; - } else - has_security = FALSE; + while (1) { + if (needs_pass) { - if (has_security) { -#ifndef NO_SECURITY - /* - * Attempt to get the security API we need. - */ - advapi = LoadLibrary("ADVAPI32.DLL"); - getsecurityinfo = - (gsi_fn_t) GetProcAddress(advapi, "GetSecurityInfo"); - if (!getsecurityinfo) { - MessageBox(NULL, - "Unable to access security APIs. Pageant will\n" - "not run, in case it causes a security breach.", - "Pageant Fatal Error", MB_ICONERROR | MB_OK); - return 1; + /* + * If we've been given a passphrase on input, try using + * it. Otherwise, try one from our tree234 of previously + * useful passphrases. + */ + if (passphrase) { + this_passphrase = (attempts == 0 ? passphrase : NULL); + } else { + this_passphrase = (const char *)index234(passphrases, attempts); + } + + if (!this_passphrase) { + /* + * Run out of passphrases to try. + */ + *retstr = comment; + sfree(rkey); + return PAGEANT_ACTION_NEED_PP; + } + } else + this_passphrase = ""; + + if (type == SSH_KEYTYPE_SSH1) + ret = loadrsakey(filename, rkey, this_passphrase, &error); + else { + skey = ssh2_load_userkey(filename, this_passphrase, &error); + if (skey == SSH2_WRONG_PASSPHRASE) + ret = -1; + else if (!skey) + ret = 0; + else + ret = 1; } -#else - MessageBox(NULL, - "This program has been compiled for Win9X and will\n" - "not run on NT, in case it causes a security breach.", - "Pageant Fatal Error", MB_ICONERROR | MB_OK); - return 1; -#endif - } else - advapi = NULL; - instance = inst; + if (ret == 0) { + /* + * Failed to load the key file, for some reason other than + * a bad passphrase. + */ + *retstr = dupstr(error); + sfree(rkey); + return PAGEANT_ACTION_FAILURE; + } else if (ret == 1) { + /* + * Successfully loaded the key file. + */ + break; + } else { + /* + * Passphrase wasn't right; go round again. + */ + attempts++; + } + } /* - * See if we can find our Help file. + * If we get here, we've succesfully loaded the key into + * rkey/skey, but not yet added it to the agent. */ - { - char b[2048], *p, *q, *r; - FILE *fp; - GetModuleFileName(NULL, b, sizeof(b) - 1); - r = b; - p = strrchr(b, '\\'); - if (p && p >= r) r = p+1; - q = strrchr(b, ':'); - if (q && q >= r) r = q+1; - strcpy(r, "putty.hlp"); - if ( (fp = fopen(b, "r")) != NULL) { - help_path = dupstr(b); - fclose(fp); - } else - help_path = NULL; - } /* - * Look for the PuTTY binary (we will enable the saved session - * submenu if we find it). + * If the key was successfully decrypted, save the passphrase for + * use with other keys we try to load. */ { - char b[2048], *p, *q, *r; - FILE *fp; - GetModuleFileName(NULL, b, sizeof(b) - 1); - r = b; - p = strrchr(b, '\\'); - if (p && p >= r) r = p+1; - q = strrchr(b, ':'); - if (q && q >= r) r = q+1; - strcpy(r, "putty.exe"); - if ( (fp = fopen(b, "r")) != NULL) { - putty_path = dupstr(b); - fclose(fp); - } else - putty_path = NULL; + char *pp_copy = dupstr(this_passphrase); + if (addpos234(passphrases, pp_copy, 0) != pp_copy) { + /* No need; it was already there. */ + smemclr(pp_copy, strlen(pp_copy)); + sfree(pp_copy); + } } - /* - * Find out if Pageant is already running. - */ - already_running = FALSE; - if (agent_exists()) - already_running = TRUE; - else { - - if (!prev) { - wndclass.style = 0; - wndclass.lpfnWndProc = WndProc; - wndclass.cbClsExtra = 0; - wndclass.cbWndExtra = 0; - wndclass.hInstance = inst; - wndclass.hIcon = LoadIcon(inst, MAKEINTRESOURCE(IDI_MAINICON)); - wndclass.hCursor = LoadCursor(NULL, IDC_IBEAM); - wndclass.hbrBackground = GetStockObject(BLACK_BRUSH); - wndclass.lpszMenuName = NULL; - wndclass.lpszClassName = APPNAME; - - RegisterClass(&wndclass); - } + if (comment) + sfree(comment); - main_hwnd = keylist = NULL; + if (type == SSH_KEYTYPE_SSH1) { + if (!pageant_local) { + unsigned char *request, *response; + void *vresponse; + int reqlen, clen, resplen; + + clen = strlen(rkey->comment); + + reqlen = 4 + 1 + /* length, message type */ + 4 + /* bit count */ + ssh1_bignum_length(rkey->modulus) + + ssh1_bignum_length(rkey->exponent) + + ssh1_bignum_length(rkey->private_exponent) + + ssh1_bignum_length(rkey->iqmp) + + ssh1_bignum_length(rkey->p) + + ssh1_bignum_length(rkey->q) + 4 + clen /* comment */ + ; - main_hwnd = CreateWindow(APPNAME, APPNAME, - WS_OVERLAPPEDWINDOW | WS_VSCROLL, - CW_USEDEFAULT, CW_USEDEFAULT, - 100, 100, NULL, NULL, inst, NULL); + request = snewn(reqlen, unsigned char); - /* Set up a system tray icon */ - AddTrayIcon(main_hwnd); + request[4] = SSH1_AGENTC_ADD_RSA_IDENTITY; + reqlen = 5; + PUT_32BIT(request + reqlen, bignum_bitcount(rkey->modulus)); + reqlen += 4; + reqlen += ssh1_write_bignum(request + reqlen, rkey->modulus); + reqlen += ssh1_write_bignum(request + reqlen, rkey->exponent); + reqlen += + ssh1_write_bignum(request + reqlen, + rkey->private_exponent); + reqlen += ssh1_write_bignum(request + reqlen, rkey->iqmp); + reqlen += ssh1_write_bignum(request + reqlen, rkey->p); + reqlen += ssh1_write_bignum(request + reqlen, rkey->q); + PUT_32BIT(request + reqlen, clen); + memcpy(request + reqlen + 4, rkey->comment, clen); + reqlen += 4 + clen; + PUT_32BIT(request, reqlen - 4); - /* Accelerators used: nsvkxa */ - systray_menu = CreatePopupMenu(); - if (putty_path) { - session_menu = CreateMenu(); - AppendMenu(systray_menu, MF_ENABLED, IDM_PUTTY, "&New Session"); - AppendMenu(systray_menu, MF_POPUP | MF_ENABLED, - (UINT) session_menu, "&Saved Sessions"); - AppendMenu(systray_menu, MF_SEPARATOR, 0, 0); + agent_query_synchronous(request, reqlen, &vresponse, &resplen); + response = vresponse; + if (resplen < 5 || response[4] != SSH_AGENT_SUCCESS) { + *retstr = dupstr("The already running Pageant " + "refused to add the key."); + freersakey(rkey); + sfree(rkey); + sfree(request); + sfree(response); + return PAGEANT_ACTION_FAILURE; + } + freersakey(rkey); + sfree(rkey); + sfree(request); + sfree(response); + } else { + if (!pageant_add_ssh1_key(rkey)) { + freersakey(rkey); + sfree(rkey); /* already present, don't waste RAM */ + } } - AppendMenu(systray_menu, MF_ENABLED, IDM_VIEWKEYS, - "&View Keys"); - AppendMenu(systray_menu, MF_ENABLED, IDM_ADDKEY, "Add &Key"); - AppendMenu(systray_menu, MF_SEPARATOR, 0, 0); - if (help_path) - AppendMenu(systray_menu, MF_ENABLED, IDM_HELP, "&Help"); - AppendMenu(systray_menu, MF_ENABLED, IDM_ABOUT, "&About"); - AppendMenu(systray_menu, MF_SEPARATOR, 0, 0); - AppendMenu(systray_menu, MF_ENABLED, IDM_CLOSE, "E&xit"); - initial_menuitems_count = GetMenuItemCount(session_menu); - - ShowWindow(main_hwnd, SW_HIDE); + } else { + if (!pageant_local) { + unsigned char *request, *response; + void *vresponse; + int reqlen, alglen, clen, keybloblen, resplen; + alglen = strlen(skey->alg->name); + clen = strlen(skey->comment); - /* - * Initialise storage for RSA keys. - */ - rsakeys = newtree234(cmpkeys_rsa); - ssh2keys = newtree234(cmpkeys_ssh2); + keybloblen = skey->alg->openssh_fmtkey(skey->data, NULL, 0); - } + reqlen = 4 + 1 + /* length, message type */ + 4 + alglen + /* algorithm name */ + keybloblen + /* key data */ + 4 + clen /* comment */ + ; - /* - * Initialise storage for short-term passphrase cache. - */ - passphrases = newtree234(NULL); + request = snewn(reqlen, unsigned char); - /* - * Process the command line and add keys as listed on it. - */ - split_into_argv(cmdline, &argc, &argv, &argstart); - for (i = 0; i < argc; i++) { - if (!strcmp(argv[i], "-c")) { - /* - * If we see `-c', then the rest of the - * command line should be treated as a - * command to be spawned. - */ - if (i < argc-1) - command = argstart[i+1]; - else - command = ""; - break; + request[4] = SSH2_AGENTC_ADD_IDENTITY; + reqlen = 5; + PUT_32BIT(request + reqlen, alglen); + reqlen += 4; + memcpy(request + reqlen, skey->alg->name, alglen); + reqlen += alglen; + reqlen += skey->alg->openssh_fmtkey(skey->data, + request + reqlen, + keybloblen); + PUT_32BIT(request + reqlen, clen); + memcpy(request + reqlen + 4, skey->comment, clen); + reqlen += clen + 4; + PUT_32BIT(request, reqlen - 4); + + agent_query_synchronous(request, reqlen, &vresponse, &resplen); + response = vresponse; + if (resplen < 5 || response[4] != SSH_AGENT_SUCCESS) { + *retstr = dupstr("The already running Pageant " + "refused to add the key."); + sfree(request); + sfree(response); + return PAGEANT_ACTION_FAILURE; + } + + sfree(request); + sfree(response); } else { - add_keyfile(filename_from_str(argv[i])); - added_keys = TRUE; + if (!pageant_add_ssh2_key(skey)) { + skey->alg->freekey(skey->data); + sfree(skey); /* already present, don't waste RAM */ + } } } + return PAGEANT_ACTION_OK; +} - /* - * Forget any passphrase that we retained while going over - * command line keyfiles. - */ - forget_passphrases(); - - if (command) { - char *args; - if (command[0] == '"') - args = strchr(++command, '"'); - else - args = strchr(command, ' '); - if (args) { - *args++ = 0; - while(*args && isspace(*args)) args++; - } - spawn_cmd(command, args, show); +int pageant_enum_keys(pageant_key_enum_fn_t callback, void *callback_ctx, + char **retstr) +{ + unsigned char *keylist, *p; + int i, nkeys, keylistlen; + char *comment; + struct pageant_pubkey cbkey; + + keylist = pageant_get_keylist1(&keylistlen); + if (keylistlen < 4) { + *retstr = dupstr("Received broken SSH-1 key list from agent"); + sfree(keylist); + return PAGEANT_ACTION_FAILURE; + } + nkeys = toint(GET_32BIT(keylist)); + if (nkeys < 0) { + *retstr = dupstr("Received broken SSH-1 key list from agent"); + sfree(keylist); + return PAGEANT_ACTION_FAILURE; + } + p = keylist + 4; + keylistlen -= 4; + + for (i = 0; i < nkeys; i++) { + struct RSAKey rkey; + char fingerprint[128]; + int n; + + /* public blob and fingerprint */ + memset(&rkey, 0, sizeof(rkey)); + n = makekey(p, keylistlen, &rkey, NULL, 0); + if (n < 0 || n > keylistlen) { + freersakey(&rkey); + *retstr = dupstr("Received broken SSH-1 key list from agent"); + sfree(keylist); + return PAGEANT_ACTION_FAILURE; + } + p += n, keylistlen -= n; + rsa_fingerprint(fingerprint, sizeof(fingerprint), &rkey); + + /* comment */ + if (keylistlen < 4) { + *retstr = dupstr("Received broken SSH-1 key list from agent"); + freersakey(&rkey); + sfree(keylist); + return PAGEANT_ACTION_FAILURE; + } + n = toint(GET_32BIT(p)); + p += 4, keylistlen -= 4; + if (n < 0 || keylistlen < n) { + *retstr = dupstr("Received broken SSH-1 key list from agent"); + freersakey(&rkey); + sfree(keylist); + return PAGEANT_ACTION_FAILURE; + } + comment = dupprintf("%.*s", (int)n, (const char *)p); + p += n, keylistlen -= n; + + cbkey.blob = rsa_public_blob(&rkey, &cbkey.bloblen); + cbkey.comment = comment; + cbkey.ssh_version = 1; + callback(callback_ctx, fingerprint, comment, &cbkey); + sfree(cbkey.blob); + freersakey(&rkey); + sfree(comment); } - /* - * If Pageant was already running, we leave now. If we haven't - * even taken any auxiliary action (spawned a command or added - * keys), complain. - */ - if (already_running) { - if (!command && !added_keys) { - MessageBox(NULL, "Pageant is already running", "Pageant Error", - MB_ICONERROR | MB_OK); - } - if (advapi) - FreeLibrary(advapi); - return 0; + sfree(keylist); + + if (keylistlen != 0) { + *retstr = dupstr("Received broken SSH-1 key list from agent"); + return PAGEANT_ACTION_FAILURE; } - /* - * Main message loop. - */ - while (GetMessage(&msg, NULL, 0, 0) == 1) { - if (!(IsWindow(keylist) && IsDialogMessage(keylist, &msg)) && - !(IsWindow(aboutbox) && IsDialogMessage(aboutbox, &msg))) { - TranslateMessage(&msg); - DispatchMessage(&msg); - } + keylist = pageant_get_keylist2(&keylistlen); + if (keylistlen < 4) { + *retstr = dupstr("Received broken SSH-2 key list from agent"); + sfree(keylist); + return PAGEANT_ACTION_FAILURE; + } + nkeys = toint(GET_32BIT(keylist)); + if (nkeys < 0) { + *retstr = dupstr("Received broken SSH-2 key list from agent"); + sfree(keylist); + return PAGEANT_ACTION_FAILURE; + } + p = keylist + 4; + keylistlen -= 4; + + for (i = 0; i < nkeys; i++) { + char *fingerprint; + int n; + + /* public blob */ + if (keylistlen < 4) { + *retstr = dupstr("Received broken SSH-2 key list from agent"); + sfree(keylist); + return PAGEANT_ACTION_FAILURE; + } + n = toint(GET_32BIT(p)); + p += 4, keylistlen -= 4; + if (n < 0 || keylistlen < n) { + *retstr = dupstr("Received broken SSH-2 key list from agent"); + sfree(keylist); + return PAGEANT_ACTION_FAILURE; + } + fingerprint = ssh2_fingerprint_blob(p, n); + cbkey.blob = p; + cbkey.bloblen = n; + p += n, keylistlen -= n; + + /* comment */ + if (keylistlen < 4) { + *retstr = dupstr("Received broken SSH-2 key list from agent"); + sfree(fingerprint); + sfree(keylist); + return PAGEANT_ACTION_FAILURE; + } + n = toint(GET_32BIT(p)); + p += 4, keylistlen -= 4; + if (n < 0 || keylistlen < n) { + *retstr = dupstr("Received broken SSH-2 key list from agent"); + sfree(fingerprint); + sfree(keylist); + return PAGEANT_ACTION_FAILURE; + } + comment = dupprintf("%.*s", (int)n, (const char *)p); + p += n, keylistlen -= n; + + cbkey.ssh_version = 2; + cbkey.comment = comment; + callback(callback_ctx, fingerprint, comment, &cbkey); + sfree(fingerprint); + sfree(comment); } - /* Clean up the system tray icon */ - { - NOTIFYICONDATA tnid; + sfree(keylist); + + if (keylistlen != 0) { + *retstr = dupstr("Received broken SSH-1 key list from agent"); + return PAGEANT_ACTION_FAILURE; + } - tnid.cbSize = sizeof(NOTIFYICONDATA); - tnid.hWnd = main_hwnd; - tnid.uID = 1; + return PAGEANT_ACTION_OK; +} - Shell_NotifyIcon(NIM_DELETE, &tnid); +int pageant_delete_key(struct pageant_pubkey *key, char **retstr) +{ + unsigned char *request, *response; + int reqlen, resplen, ret; + void *vresponse; + + if (key->ssh_version == 1) { + reqlen = 5 + key->bloblen; + request = snewn(reqlen, unsigned char); + PUT_32BIT(request, reqlen - 4); + request[4] = SSH1_AGENTC_REMOVE_RSA_IDENTITY; + memcpy(request + 5, key->blob, key->bloblen); + } else { + reqlen = 9 + key->bloblen; + request = snewn(reqlen, unsigned char); + PUT_32BIT(request, reqlen - 4); + request[4] = SSH2_AGENTC_REMOVE_IDENTITY; + PUT_32BIT(request + 5, key->bloblen); + memcpy(request + 9, key->blob, key->bloblen); + } - DestroyMenu(systray_menu); + agent_query_synchronous(request, reqlen, &vresponse, &resplen); + response = vresponse; + if (resplen < 5 || response[4] != SSH_AGENT_SUCCESS) { + *retstr = dupstr("Agent failed to delete key"); + ret = PAGEANT_ACTION_FAILURE; + } else { + *retstr = NULL; + ret = PAGEANT_ACTION_OK; } + sfree(request); + sfree(response); + return ret; +} - if (advapi) - FreeLibrary(advapi); - return msg.wParam; +int pageant_delete_all_keys(char **retstr) +{ + unsigned char request[5], *response; + int reqlen, resplen, success; + void *vresponse; + + PUT_32BIT(request, 1); + request[4] = SSH2_AGENTC_REMOVE_ALL_IDENTITIES; + reqlen = 5; + agent_query_synchronous(request, reqlen, &vresponse, &resplen); + response = vresponse; + success = (resplen >= 4 && response[4] == SSH_AGENT_SUCCESS); + sfree(response); + if (!success) { + *retstr = dupstr("Agent failed to delete SSH-2 keys"); + return PAGEANT_ACTION_FAILURE; + } + + PUT_32BIT(request, 1); + request[4] = SSH1_AGENTC_REMOVE_ALL_RSA_IDENTITIES; + reqlen = 5; + agent_query_synchronous(request, reqlen, &vresponse, &resplen); + response = vresponse; + success = (resplen >= 4 && response[4] == SSH_AGENT_SUCCESS); + sfree(response); + if (!success) { + *retstr = dupstr("Agent failed to delete SSH-1 keys"); + return PAGEANT_ACTION_FAILURE; + } + + *retstr = NULL; + return PAGEANT_ACTION_OK; +} + +struct pageant_pubkey *pageant_pubkey_copy(struct pageant_pubkey *key) +{ + struct pageant_pubkey *ret = snew(struct pageant_pubkey); + ret->blob = snewn(key->bloblen, unsigned char); + memcpy(ret->blob, key->blob, key->bloblen); + ret->bloblen = key->bloblen; + ret->comment = key->comment ? dupstr(key->comment) : NULL; + ret->ssh_version = key->ssh_version; + return ret; +} + +void pageant_pubkey_free(struct pageant_pubkey *key) +{ + sfree(key->comment); + sfree(key->blob); + sfree(key); }