From 98a213e832a20dde79a7a51676ece2949fe5d004 Mon Sep 17 00:00:00 2001 From: Jacob Nevins Date: Fri, 20 May 2022 13:28:01 +0100 Subject: [PATCH 1/3] Document Windows PuTTYgen's -E option. This was missed in 11aa9ab8f3. --- doc/pubkey.but | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/pubkey.but b/doc/pubkey.but index 57282455..80382076 100644 --- a/doc/pubkey.but +++ b/doc/pubkey.but @@ -549,6 +549,11 @@ key. } +\dt \cw{\-E} \e{fptype} + +\dd Algorithm to use when displaying key fingerprints. You can +select \c{sha256} or \c{md5}. See \k{puttygen-fingerprint}. + \H{pubkey-gettingready} Getting ready for public key authentication Connect to your SSH server using PuTTY with the SSH protocol. When the From 2985383c0bc4c40c18f573ebaf1209727f8f8531 Mon Sep 17 00:00:00 2001 From: Jacob Nevins Date: Fri, 20 May 2022 19:33:31 +0100 Subject: [PATCH 2/3] Indexing for Windows Pageant command-line options. --- doc/index.but | 5 +++++ doc/pageant.but | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/index.but b/doc/index.but index afd74167..4c76bb05 100644 --- a/doc/index.but +++ b/doc/index.but @@ -867,6 +867,11 @@ saved sessions from \IM{authentication agent} agent, authentication \IM{-c-pageant} \c{-c} Pageant command-line option +\IM{--keylist} \c{--keylist} Pageant command-line option +\IM{--openssh-config} \c{--openssh-config} Pageant command-line option + +\IM{Windows OpenSSH} Windows OpenSSH +\IM{Windows OpenSSH} OpenSSH, on Windows \IM{FAQ} FAQ \IM{FAQ} Frequently Asked Questions diff --git a/doc/pageant.but b/doc/pageant.but index 97d41087..1f6b7c21 100644 --- a/doc/pageant.but +++ b/doc/pageant.but @@ -170,7 +170,7 @@ by the command, like this: \c C:\PuTTY\pageant.exe d:\main.ppk -c C:\PuTTY\putty.exe -\S{pageant-cmdline-openssh} Integrating with Windows OpenSSH +\S{pageant-cmdline-openssh} Integrating with \i{Windows OpenSSH} Windows's own port of OpenSSH uses the same mechanism as Pageant to talk to its SSH agent (Windows named pipes). This means that Windows @@ -184,7 +184,7 @@ configuration, then \c{ssh.exe} should automatically use Pageant as its agent, so that you can keep your keys in one place and have both SSH clients able to use them. -The option is \c{--openssh-config}, and you follow it with a filename. +The option is \i\c{--openssh-config}, and you follow it with a filename. To refer to this file from your main OpenSSH configuration, you can use the \cq{Include} directive. For example, you might run Pageant From 176f01ea7cc1a848179e09b93820acf839c68f52 Mon Sep 17 00:00:00 2001 From: Jacob Nevins Date: Fri, 20 May 2022 19:33:56 +0100 Subject: [PATCH 3/3] Ensure Unix putty and pterm have correct icons. I noticed that my pterm had the same icon as my putty. --- unix/CMakeLists.txt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/unix/CMakeLists.txt b/unix/CMakeLists.txt index 342ca14f..c2d5e2eb 100644 --- a/unix/CMakeLists.txt +++ b/unix/CMakeLists.txt @@ -19,14 +19,16 @@ add_sources_from_current_dir(utils utils/pollwrap.c utils/signal.c utils/x11_ignore_error.c - # Compiled icon pixmap files - putty-xpm.c - putty-config-xpm.c - pterm-xpm.c - pterm-config-xpm.c # We want the ISO C implementation of ltime(), because we don't have # a local better alternative ../utils/ltime.c) +# Compiled icon pixmap files +add_library(puttyxpms STATIC + putty-xpm.c + putty-config-xpm.c) +add_library(ptermxpms STATIC + pterm-xpm.c + pterm-config-xpm.c) add_sources_from_current_dir(eventloop cliloop.c uxsel.c) add_sources_from_current_dir(console @@ -152,7 +154,7 @@ if(GTK_FOUND) pty.c) be_list(pterm pterm) target_link_libraries(pterm - guiterminal eventloop settings charset utils + guiterminal eventloop settings charset utils ptermxpms ${GTK_LIBRARIES} ${X11_LIBRARIES}) installed_program(pterm) @@ -166,7 +168,7 @@ if(GTK_FOUND) pty.c) be_list(ptermapp pterm) target_link_libraries(ptermapp - guiterminal eventloop settings charset utils + guiterminal eventloop settings charset utils ptermxpms ${GTK_LIBRARIES} ${X11_LIBRARIES}) endif() @@ -176,7 +178,7 @@ if(GTK_FOUND) be_list(putty PuTTY SSH SERIAL OTHERBACKENDS) target_link_libraries(putty guiterminal eventloop sshclient otherbackends settings - network crypto charset utils + network crypto charset utils puttyxpms ${GTK_LIBRARIES} ${X11_LIBRARIES}) set_target_properties(putty PROPERTIES LINK_INTERFACE_MULTIPLICITY 2) @@ -190,7 +192,7 @@ if(GTK_FOUND) be_list(puttyapp PuTTY SSH SERIAL OTHERBACKENDS) target_link_libraries(puttyapp guiterminal eventloop sshclient otherbackends settings - network crypto charset utils + network crypto charset utils puttyxpms ${GTK_LIBRARIES} ${X11_LIBRARIES}) endif() @@ -204,5 +206,6 @@ if(GTK_FOUND) be_list(puttytel PuTTYtel SERIAL OTHERBACKENDS) target_link_libraries(puttytel guiterminal eventloop otherbackends settings network charset utils + puttyxpms ${GTK_LIBRARIES} ${X11_LIBRARIES}) endif()