Enhanced Authorized Key Output

- Modified the authorized key string to include the certificate subject name - Added shortcuts keys for the Pageant key list - Recompiled binaries based on changes
NoMoreFood · Jan 19, 2018 · bc80c7c · bc80c7c
1 parent 5f74bce
commit bc80c7c
Show file tree

Hide file tree

Showing 22 changed files with 73 additions and 61 deletions.
diff --git a/binaries/puttycac-0.70u3-installer.msi b/binaries/puttycac-0.70u3-installer.msi
diff --git a/binaries/puttycac-64bit-0.70u3-installer.msi b/binaries/puttycac-64bit-0.70u3-installer.msi
diff --git a/binaries/puttycac-hash.txt b/binaries/puttycac-hash.txt
@@ -1,69 +1,69 @@
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA256          3D8DAD3DD4AF03F4AE2F8B7E3B3696D8B1529336CF0ABAE832410F296059FFF4       \binaries\x64\pageant.exe
-SHA256          B521DAAA28370AA1C81A38A80834F5B4CE74EEFD6CC8EFA654C55196A4CFA76E       \binaries\x64\plink.exe
-SHA256          00A3C078E5FD6958C7EE0171A45BB138DF3BFC2731B5640842A7680A774A9073       \binaries\x64\pscp.exe
-SHA256          246A9A91A3D6A5AC06F4FA10EB7ED9404026C6E9A1D85916D2166AA3F1F7D289       \binaries\x64\psftp.exe
-SHA256          685B6657DDEB74601D1556F1577D4B5A27EA68F60F2D0E1E1D3342F1D67503F2       \binaries\x64\putty.exe
-SHA256          CB099CFF52D33F02E094A69BF17254467DFD6BB0A1434ED04FDF9C4E04459BC6       \binaries\x64\puttygen.exe
-SHA256          8C1540FA7C0701A944D36792E1D567D8A27DC30BAF2130E7BEDA498F76EFEEEE       \binaries\x64\puttytel.exe
-SHA256          D3ACA07214B267583B1C5250D2EE4A8607A2D22C88735579CA9BECD3AF86DFCC       \binaries\x64\testbn.exe
-SHA256          C3CA8C52791BC6BB01D36ABECBCEF6378122CD2C422CD610EB8B4F3E9D5C5372       \binaries\x86\pageant.exe
-SHA256          792C3826655CCCAC942AA31001DC5FCE8847E8AE7B0172C73135D433559C8EAA       \binaries\x86\plink.exe
-SHA256          6802A49A80FA0A3F427D506B4127DF79D92B2F122CBFFE2959978C8B34BB2140       \binaries\x86\pscp.exe
-SHA256          DC23FEF7A04DE57322BDE28B17F69885D24973B9A7FE8729375F65DAAE156E31       \binaries\x86\psftp.exe
-SHA256          91E0B095852A31494E878411422C64C5C88DFB60616D842FC4DF93C5D07A9633       \binaries\x86\putty.exe
-SHA256          A3521D02379EBD16C07B38CEC8BA695D30F45156011FD457BDA738A8FCCEFB36       \binaries\x86\puttygen.exe
-SHA256          FAA3563AB450133FD2FC7F1BA207DB818740737A225C4A125A3AE8E3A0F9CE48       \binaries\x86\puttytel.exe
-SHA256          F15FEB8562FD688BF9455592A76203E7CA079747AF594C2761CA718CFDE1293B       \binaries\x86\testbn.exe
-SHA256          E8E69C8C905C062EB402D9E53F52A4BBB84190C7E5CC5368C6776CBE213E5D2A       \binaries\puttycac-0.70u3-installer.msi
-SHA256          6DCE056F2D1E26BE9782241ABB538DF9F9FDA653344D7632608A07D84555D64F       \binaries\puttycac-64bit-0.70u3-installer.msi
+SHA256          1293AE1584E7620E26FF42B53CAAA263FA094E8B5B44402E3D64B9FC7A45699C       \binaries\x64\pageant.exe
+SHA256          E5A47C77D80EA249CA12F0D2D3C2623688A9BD50ED0730C7FC0BFE020475E32B       \binaries\x64\plink.exe
+SHA256          3598DEA579D3BF34F583F83FE854989B21BD11AE61D7FF3B1326C540D1351685       \binaries\x64\pscp.exe
+SHA256          967AC7AF8D44825400DC010D77A691D77A43826259E409DE75ECC5289AB68BBF       \binaries\x64\psftp.exe
+SHA256          D17E0BC6A3D3696CB41CA9FFCA0DA32A4EEDA3571D3BD94B9142EC1D37B4A28B       \binaries\x64\putty.exe
+SHA256          1E236D42BAA8B6A69C8704AEA717219A4FF1B6DCF1C563D9870AC0EECBFA4E0C       \binaries\x64\puttygen.exe
+SHA256          050960D1287E9997F9DDBCF3BAF85AA9DECF0B7EEBEDAE1BD16F28A9F3AAD7D3       \binaries\x64\puttytel.exe
+SHA256          8D580F40363A2833A66977C32B423A6272EAED4B9326EB6B41E2AF27832B0CC1       \binaries\x64\testbn.exe
+SHA256          1172CAD835C9C8979D8D32E0947ABB97F6955A90442733521BA673E1C400BE07       \binaries\x86\pageant.exe
+SHA256          1C60E697168E3AB7E446708F3371B84EC2356AC56749BB13EAD9976AEA2C7CAA       \binaries\x86\plink.exe
+SHA256          AEE754B2AD42C0862C16C46BCCA8BBC2CCE11C68B104F4EFC1355BE84BDDBFFC       \binaries\x86\pscp.exe
+SHA256          8961119C1B5C9DCC59A958B36DF90BFE1EA264A127450E068A3CE75A0B9451B6       \binaries\x86\psftp.exe
+SHA256          99EB3242CEB86A839677C180944A8B8B0FE609533E5CE1DBE4CDF7975062679D       \binaries\x86\putty.exe
+SHA256          67341998785FC11C30DEE5F7A208094C912DFD03C3A264758C466076C2686D13       \binaries\x86\puttygen.exe
+SHA256          FCCE6DA17D1F6D3CC222228FDA5E0C4AE5EB6370EF735FCBA1C68B4C67A71CD0       \binaries\x86\puttytel.exe
+SHA256          3EC3EA16FED08ED5B9BE4F4C67520F577D98AC893CDCA45E76AF14D56B670659       \binaries\x86\testbn.exe
+SHA256          F3E72374D32BF3726D15B56AE0D6FAEF5C0E44D33B2163EA9990780CFB7DF064       \binaries\puttycac-0.70u3-installer.msi
+SHA256          42093B732FF3378CB42A112093A3B072289B664CBDA0624B06EDC90DF22D8967       \binaries\puttycac-64bit-0.70u3-installer.msi
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA1            D170CA1A50399615F7F8E72178001F5C81432C17                               \binaries\x64\pageant.exe
-SHA1            F10AAB859FBC49FA25CADB5BAF7EBBBC9812C94E                               \binaries\x64\plink.exe
-SHA1            D22DE7D58ECE002C49761A6F4608D1B4D7D22E6F                               \binaries\x64\pscp.exe
-SHA1            29D2EAB24F593CDC0BB73CA739FA536B60F1CEEE                               \binaries\x64\psftp.exe
-SHA1            6CC6B5ED268111E825EAC075FCA7DED540D5F1C1                               \binaries\x64\putty.exe
-SHA1            33801731B2FBB08A40D63EA4848FCEFF85F8B035                               \binaries\x64\puttygen.exe
-SHA1            F541ACE368F67F0C3E26E295441C5962770D7DB4                               \binaries\x64\puttytel.exe
-SHA1            2FF9D950348545590D32744155EB49588AD54014                               \binaries\x64\testbn.exe
-SHA1            EBDD0AC668DD5DFF6AAE448F9CF31E5D1676778D                               \binaries\x86\pageant.exe
-SHA1            08B4CE287A89A1D9C1683E40893F8E498C1FACB7                               \binaries\x86\plink.exe
-SHA1            954413B2B0456FB9A71672D3DEC2D4E4B48E43CC                               \binaries\x86\pscp.exe
-SHA1            824014D8E4D7A1FA43042B29418AE2B818926D0E                               \binaries\x86\psftp.exe
-SHA1            69A7EA218664D4193609B1EECF63F8A2068E5F89                               \binaries\x86\putty.exe
-SHA1            ECFD089CF7EE7A7E1E82C247B534430172C38948                               \binaries\x86\puttygen.exe
-SHA1            558D249255128EEAE20D7A5AC539AC1FD7E08878                               \binaries\x86\puttytel.exe
-SHA1            A9378C7889574F957509E2C67AB571EF2D3FD771                               \binaries\x86\testbn.exe
-SHA1            FCC0097A70E6AD45E38B9717AAC4A93F25C8AE35                               \binaries\puttycac-0.70u3-installer.msi
-SHA1            DF99601D44A0734655C8FD78D3DF9325D5DE3F99                               \binaries\puttycac-64bit-0.70u3-installer.msi
+SHA1            5CB62CA4E199E77E8438479F6FC57132C65EC3CB                               \binaries\x64\pageant.exe
+SHA1            C02923167D25206FA5B42C6EEE83A7B863A18F98                               \binaries\x64\plink.exe
+SHA1            B142709DA156E6CB5985E0903B9446319FEBA846                               \binaries\x64\pscp.exe
+SHA1            FF35FBCCF0A460B497A5B5A6A69524376D6C2AC7                               \binaries\x64\psftp.exe
+SHA1            2A214522029F581EABBE413A0DBEC1C4ED8ED510                               \binaries\x64\putty.exe
+SHA1            BD38DB8E5E2325068ECB03FF9238CFCCDB79864F                               \binaries\x64\puttygen.exe
+SHA1            E70D0C07CBE163AECFA04D1B2453BE958A3ABB91                               \binaries\x64\puttytel.exe
+SHA1            2CDBA019C5EC514E481A96FC4AB5984C2449D09B                               \binaries\x64\testbn.exe
+SHA1            BD1E19576F46BC9A21F46785BF128337C2D1281C                               \binaries\x86\pageant.exe
+SHA1            AB6EF44ED58CEC29FD355B9F5537C171C3871983                               \binaries\x86\plink.exe
+SHA1            55600AC42949068AB45BCAB4E5884635DCF2038B                               \binaries\x86\pscp.exe
+SHA1            9A2E8FA2E125414A4DB4F92A8D58917A417A7977                               \binaries\x86\psftp.exe
+SHA1            89637B1CC396AEDA590CDC6A3205446DA13DB17A                               \binaries\x86\putty.exe
+SHA1            BAFEE186B37940081BEC07F4DEBCD5241118C0C2                               \binaries\x86\puttygen.exe
+SHA1            B8EC365B8A6DE163213019C0E7B05F0395FB8D74                               \binaries\x86\puttytel.exe
+SHA1            B4991146508AB534A962341FA62A498726002831                               \binaries\x86\testbn.exe
+SHA1            25C975C43D2CFE35AE924D1203907A6153E528D5                               \binaries\puttycac-0.70u3-installer.msi
+SHA1            CFA888EDC6A9E0470489D4A819FA7C847A7AFFE1                               \binaries\puttycac-64bit-0.70u3-installer.msi
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-MD5             DA75CB5B42AA51F933B9ABC7C001C18A                                       \binaries\x64\pageant.exe
-MD5             DE3420BDCCB2D6B8D3D0FE0030C0AE0A                                       \binaries\x64\plink.exe
-MD5             0D886811E82882E9D7F0043E8C848F02                                       \binaries\x64\pscp.exe
-MD5             C7FE5BDE4B699960CB43D677E8DBE30C                                       \binaries\x64\psftp.exe
-MD5             EB7E7F210D83F25A1EDD49C16636893A                                       \binaries\x64\putty.exe
-MD5             0F0ECE5415340B92AF9188579FFEF4C6                                       \binaries\x64\puttygen.exe
-MD5             33B9ADD06B3AB4659BE010563C29F4A5                                       \binaries\x64\puttytel.exe
-MD5             02B6DCA1BFA1B7B9F09DBAAF9DD0869E                                       \binaries\x64\testbn.exe
-MD5             13BA9AEFA4041DC9F7D8CA2BD7031026                                       \binaries\x86\pageant.exe
-MD5             07764FF6D0188E6BE0B7D3522CAAFA2C                                       \binaries\x86\plink.exe
-MD5             9831980A58F64CF78E5487AB7BBF9E13                                       \binaries\x86\pscp.exe
-MD5             DB6B8EFDF3BC721CC7174ECD7E76915B                                       \binaries\x86\psftp.exe
-MD5             B0C728532A1E2D698136CDA73536B6DB                                       \binaries\x86\putty.exe
-MD5             60D76BFCEFBFE800EADFE9BDAF63A933                                       \binaries\x86\puttygen.exe
-MD5             9F4513F31A743D06D8BE58566FC236BE                                       \binaries\x86\puttytel.exe
-MD5             0F8460014EE7E7A3B25989D4475D3E4B                                       \binaries\x86\testbn.exe
-MD5             AEFC6B343096D1CF8EA2CCBECF583240                                       \binaries\puttycac-0.70u3-installer.msi
-MD5             C2B067181C02C4D21121FF489EE1FCC9                                       \binaries\puttycac-64bit-0.70u3-installer.msi
+MD5             BF7F5F458B63361BFA4244E1BB848186                                       \binaries\x64\pageant.exe
+MD5             C8DDFBD8C29017DEB6F1FBC5FB962BD4                                       \binaries\x64\plink.exe
+MD5             7DADC23573D7FC5A18787AC5DB1E62D0                                       \binaries\x64\pscp.exe
+MD5             378F87A4AF66E2E65F16B726DEBFD010                                       \binaries\x64\psftp.exe
+MD5             93F8DF89ABDA06921BB8BBAB709C3FFA                                       \binaries\x64\putty.exe
+MD5             9C446C2EE8838E9E4491E0D614A092D5                                       \binaries\x64\puttygen.exe
+MD5             B3A489D3577303EAE10EB55D69DFD4C0                                       \binaries\x64\puttytel.exe
+MD5             6BEF85D066AD6E5686ACF6093F5405F9                                       \binaries\x64\testbn.exe
+MD5             0380E38CC269F97EC621839EF7B670D9                                       \binaries\x86\pageant.exe
+MD5             AFCEC15E65C2D5C7671BA6175FAAE59D                                       \binaries\x86\plink.exe
+MD5             9184CB4AE120063F2C3FCC5AA5C8B614                                       \binaries\x86\pscp.exe
+MD5             7DA5FCB2EAF93AD2EDF0901CE60D3BF5                                       \binaries\x86\psftp.exe
+MD5             1F710AB00104E8A8D27DCAE5649624BC                                       \binaries\x86\putty.exe
+MD5             A0E5C859C696435FFAE0EAA38FC8D279                                       \binaries\x86\puttygen.exe
+MD5             66504F3DC1B4CABEBE06573A7C2173E0                                       \binaries\x86\puttytel.exe
+MD5             F6B2B93F9C1D2E295CA4FFD1E1D6D983                                       \binaries\x86\testbn.exe
+MD5             D3D5F110DC43ECF79457DA9B4DBFEA3E                                       \binaries\puttycac-0.70u3-installer.msi
+MD5             8F2C41A765E94ECFDFEF932B4E5472F7                                       \binaries\puttycac-64bit-0.70u3-installer.msi
 
 
diff --git a/binaries/x64/pageant.exe b/binaries/x64/pageant.exe
diff --git a/binaries/x64/plink.exe b/binaries/x64/plink.exe
diff --git a/binaries/x64/pscp.exe b/binaries/x64/pscp.exe
diff --git a/binaries/x64/psftp.exe b/binaries/x64/psftp.exe
diff --git a/binaries/x64/putty.exe b/binaries/x64/putty.exe
diff --git a/binaries/x64/puttygen.exe b/binaries/x64/puttygen.exe
diff --git a/binaries/x64/puttytel.exe b/binaries/x64/puttytel.exe
diff --git a/binaries/x64/testbn.exe b/binaries/x64/testbn.exe
diff --git a/binaries/x86/pageant.exe b/binaries/x86/pageant.exe
diff --git a/binaries/x86/plink.exe b/binaries/x86/plink.exe
diff --git a/binaries/x86/pscp.exe b/binaries/x86/pscp.exe
diff --git a/binaries/x86/psftp.exe b/binaries/x86/psftp.exe
diff --git a/binaries/x86/putty.exe b/binaries/x86/putty.exe
diff --git a/binaries/x86/puttygen.exe b/binaries/x86/puttygen.exe
diff --git a/binaries/x86/puttytel.exe b/binaries/x86/puttytel.exe
diff --git a/binaries/x86/testbn.exe b/binaries/x86/testbn.exe
diff --git a/cert/cert_common.c b/cert/cert_common.c
@@ -322,17 +322,28 @@ LPSTR cert_key_string(LPCSTR szCert)
 	HCERTSTORE hCertStore = NULL;
 	if (cert_load_cert(szCert, &pCertContext, &hCertStore) == FALSE) return NULL;
 
-	// get the open ssh ekys trings
+	// obtain the key and destory the comment since we are going to customize it
 	struct ssh2_userkey * pUserKey = cert_get_ssh_userkey(szCert, pCertContext);
-	char * szKey = ssh2_pubkey_openssh_str(pUserKey);
+	sfree(pUserKey->comment);
+	pUserKey->comment = "";
+
+	// fetch the elements of the strin
+	LPSTR szKey = ssh2_pubkey_openssh_str(pUserKey);
+	LPSTR szName = cert_subject_string(szCert);
+	LPSTR szHash = cert_get_cert_hash(szCert, pCertContext, NULL);
+
+	// append the ssh string, identifer:thumbprint, and certificate subject
+	LPSTR szKeyWithComment = dupprintf("%s %s %s", szKey, szHash, szName);
 
 	// clean and return
-	free(pUserKey->comment);
 	pUserKey->alg->freekey(pUserKey->data);
 	sfree(pUserKey);
+	sfree(szKey);
+	sfree(szName);
+	sfree(szHash);
 	CertFreeCertificateContext(pCertContext);
 	CertCloseStore(hCertStore, 0);
-	return szKey;
+	return szKeyWithComment;
 }
 
 LPSTR cert_subject_string(LPCSTR szCert)

diff --git a/cert/cert_common.h b/cert/cert_common.h
@@ -56,6 +56,7 @@ EXTERN LPBYTE cert_get_hash(LPCSTR szAlgo, LPCBYTE pDataToHash, DWORD iDataToHas
 #define cert_is_capipath(p) (strnicmp((LPSTR) p, IDEN_CAPI, IDEN_CAPI_SIZE) == 0)
 #define cert_is_pkcspath(p) (strnicmp((LPSTR) p, IDEN_PKCS, IDEN_PKCS_SIZE) == 0)
 #define cert_is_certpath(p) (p != NULL && (cert_is_capipath(p) || cert_is_pkcspath(p)))
+#define cert_iden(p) (cert_is_capipath(p) ? IDEN_CAPI : (cert_is_pkcspath(p) ? IDEN_PKCS : "")))
 
 #endif /* USE_CAPI */
 
diff --git a/windows/pageant.rc b/windows/pageant.rc
@@ -37,9 +37,9 @@ BEGIN
     PUSHBUTTON      "&Remove",102,270,160,50,14
     PUSHBUTTON      "&Help",103,10,180,50,14
     DEFPUSHBUTTON   "&Close",IDOK,270,180,50,14
-    PUSHBUTTON      "Add PKCS Cert", IDC_PAGEANT_ADD_PKCS,142,160,60,14
-    PUSHBUTTON      "Add CAPI Cert", IDC_PAGEANT_ADD_CAPI,78,160,60,14
-	PUSHBUTTON      "Copy To Clipboard", IDC_PAGEANT_CLIP_KEY,68,180,80,14
+    PUSHBUTTON      "Add &PKCS Cert", IDC_PAGEANT_ADD_PKCS,142,160,60,14
+    PUSHBUTTON      "&Add CAPI Cert", IDC_PAGEANT_ADD_CAPI,78,160,60,14
+	PUSHBUTTON      "Copy &To Clipboard", IDC_PAGEANT_CLIP_KEY,68,180,80,14
 END
 #else
 BEGIN