mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-09 01:18:00 +00:00
cd7f6c4407
OpenSSH, when called on to give the fingerprint of a certified public
key, will in many circumstances generate the hash of the public blob
of the _underlying_ key, rather than the hash of the full certificate.
I think the hash of the certificate is also potentially useful (if
nothing else, it provides a way to tell apart multiple certificates on
the same key). But I can also see that it's useful to be able to
recognise a key as the same one 'really' (since all certificates on
the same key share a private key, so they're unavoidably related).
So I've dealt with this by introducing an extra pair of fingerprint
types, giving the cross product of {MD5, SHA-256} x {base key only,
full certificate}. You can manually select which one you want to see
in some circumstances (notably PuTTYgen), and in others (such as
diagnostics) both fingerprints will be emitted side by side via the
new functions ssh2_double_fingerprint[_blob].
The default, following OpenSSH, is to just fingerprint the base key.
96 lines
3.3 KiB
Plaintext
96 lines
3.3 KiB
Plaintext
/*
|
|
* Windows resources for Pageant.
|
|
*/
|
|
|
|
#include "rcstuff.h"
|
|
|
|
#define APPNAME "Pageant"
|
|
#define APPDESC "PuTTY SSH authentication agent"
|
|
|
|
#include "pageant-rc.h"
|
|
|
|
#include "help.rc2"
|
|
|
|
IDI_MAINICON ICON "pageant.ico"
|
|
IDI_TRAYICON ICON "pageants.ico"
|
|
|
|
IDD_LOAD_PASSPHRASE DIALOG DISCARDABLE 0, 0, 140, 60
|
|
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
|
CAPTION "Pageant: Loading Encrypted Key"
|
|
FONT 8, "MS Shell Dlg"
|
|
BEGIN
|
|
CTEXT "Enter passphrase to load key", IDC_PASSPHRASE_STATIC1, 10, 6, 120, 8
|
|
CTEXT "", IDC_PASSPHRASE_FINGERPRINT, 10, 16, 120, 8
|
|
EDITTEXT IDC_PASSPHRASE_EDITBOX, 10, 26, 120, 12,
|
|
ES_PASSWORD | ES_AUTOHSCROLL
|
|
DEFPUSHBUTTON "O&K", IDOK, 20, 42, 40, 14
|
|
PUSHBUTTON "&Cancel", IDCANCEL, 80, 42, 40, 14
|
|
END
|
|
|
|
IDD_ONDEMAND_PASSPHRASE DIALOG DISCARDABLE 0, 0, 250, 78
|
|
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
|
CAPTION "Pageant: Decrypting Stored Key"
|
|
FONT 8, "MS Shell Dlg"
|
|
BEGIN
|
|
CTEXT "A client of Pageant wants to use the following encrypted key:",
|
|
IDC_PASSPHRASE_STATIC1, 10, 6, 230, 8
|
|
CTEXT "", IDC_PASSPHRASE_FINGERPRINT, 10, 16, 230, 8
|
|
CTEXT "If you intended this, click in this box to make sure it has",
|
|
IDC_PASSPHRASE_STATIC2, 10, 26, 230, 8
|
|
CTEXT "input focus, then enter the passphrase to decrypt the key.",
|
|
IDC_PASSPHRASE_STATIC3, 10, 34, 230, 8
|
|
EDITTEXT IDC_PASSPHRASE_EDITBOX, 10, 44, 230, 12,
|
|
ES_PASSWORD | ES_AUTOHSCROLL
|
|
DEFPUSHBUTTON "O&K", IDOK, 45, 60, 40, 14
|
|
PUSHBUTTON "&Cancel", IDCANCEL, 105, 60, 40, 14
|
|
PUSHBUTTON "&Help", IDHELP, 165, 60, 50, 14
|
|
END
|
|
|
|
IDD_KEYLIST DIALOG DISCARDABLE 0, 0, 450, 236
|
|
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
|
CAPTION "Pageant Key List"
|
|
FONT 8, "MS Shell Dlg"
|
|
BEGIN
|
|
LISTBOX IDC_KEYLIST_LISTBOX, 10, 10, 420, 155,
|
|
LBS_EXTENDEDSEL | LBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP
|
|
PUSHBUTTON "&Add Key", IDC_KEYLIST_ADDKEY, 10, 187, 60, 14
|
|
PUSHBUTTON "Add Key (&encrypted)", IDC_KEYLIST_ADDKEY_ENC, 75, 187, 80, 14
|
|
PUSHBUTTON "Re-e&ncrypt", IDC_KEYLIST_REENCRYPT, 315, 187, 60, 14
|
|
PUSHBUTTON "&Remove", IDC_KEYLIST_REMOVE, 380, 187, 60, 14
|
|
PUSHBUTTON "&Help", IDC_KEYLIST_HELP, 10, 212, 50, 14
|
|
DEFPUSHBUTTON "&Close", IDOK, 390, 212, 50, 14
|
|
LTEXT "&Fingerprint type:", IDC_KEYLIST_FPTYPE_STATIC, 10, 172, 60, 8
|
|
COMBOBOX IDC_KEYLIST_FPTYPE, 70, 170, 100, 12, CBS_DROPDOWNLIST
|
|
END
|
|
|
|
/* Accelerators used: cl */
|
|
IDD_ABOUT DIALOG DISCARDABLE 140, 40, 270, 136
|
|
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
|
CAPTION "About Pageant"
|
|
FONT 8, "MS Shell Dlg"
|
|
BEGIN
|
|
DEFPUSHBUTTON "&Close", IDOK, 216, 118, 48, 14
|
|
PUSHBUTTON "View &Licence", IDC_ABOUT_LICENCE, 6, 118, 70, 14
|
|
PUSHBUTTON "Visit &Web Site", IDC_ABOUT_WEBSITE, 140, 118, 70, 14
|
|
EDITTEXT IDC_ABOUT_TEXTBOX, 10, 6, 250, 110,
|
|
ES_READONLY | ES_MULTILINE | ES_CENTER, WS_EX_STATICEDGE
|
|
END
|
|
|
|
/* No accelerators used */
|
|
IDD_LICENCE DIALOG DISCARDABLE 50, 50, 326, 239
|
|
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
|
CAPTION "PuTTY Licence"
|
|
FONT 8, "MS Shell Dlg"
|
|
BEGIN
|
|
DEFPUSHBUTTON "OK", IDOK, 148, 219, 44, 14
|
|
|
|
EDITTEXT IDC_LICENCE_TEXTBOX, 10, 10, 306, 200,
|
|
ES_READONLY | ES_MULTILINE | ES_LEFT, WS_EX_STATICEDGE
|
|
END
|
|
|
|
#include "version.rc2"
|
|
|
|
#ifndef NO_MANIFESTS
|
|
1 RT_MANIFEST "pageant.mft"
|
|
#endif /* NO_MANIFESTS */
|