head 1.7; access; symbols pkgsrc-2026Q2:1.6.0.28 pkgsrc-2026Q2-base:1.6 pkgsrc-2026Q1:1.6.0.26 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.24 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.22 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.20 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.18 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.16 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.14 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.12 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.10 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.8 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.6 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.4 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.2 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.5.0.26 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.24 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.22 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.20 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.18 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.16 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.14 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.12 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.10 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.8 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.6 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.2 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.4 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.4.0.4 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.2 pkgsrc-2019Q2-base:1.4 pkgsrc-2013Q2:1.2.0.6 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.4 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.2 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.1.0.8 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.6 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.4 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.2; locks; strict; comment @ * @; 1.7 date 2026.08.17.07.45.28; author wiz; state dead; branches; next 1.6; commitid KVLKXsntMhogMXRG; 1.6 date 2023.02.14.03.28.07; author ryoon; state Exp; branches; next 1.5; commitid 8ONHepAY2hw7vrdE; 1.5 date 2019.12.19.22.22.33; author joerg; state Exp; branches; next 1.4; commitid ymjxN57PzvM6QmPB; 1.4 date 2019.04.01.12.10.43; author ryoon; state Exp; branches; next 1.3; commitid W5i2HDS9ENdmSDhB; 1.3 date 2013.08.07.11.06.39; author drochner; state dead; branches; next 1.2; commitid HG1z67uc9xxOOv0x; 1.2 date 2012.11.01.19.32.44; author joerg; state Exp; branches 1.2.6.1; next 1.1; 1.1 date 2012.02.22.15.27.16; author wiz; state Exp; branches 1.1.2.1; next ; 1.2.6.1 date 2013.08.21.19.40.13; author tron; state dead; branches; next ; commitid OiXXKVNTb3M2em2x; 1.1.2.1 date 2012.02.22.15.27.16; author tron; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2012.02.23.15.53.56; author tron; state Exp; branches; next ; desc @@ 1.7 log @putty: remove two patches Just tried - but not accepted by upstream. Code compiles without them. @ text @$NetBSD: patch-terminal.c,v 1.6 2023/02/14 03:28:07 ryoon Exp $ Make the home/end keys work on BSD servers as well as Linux ones --- terminal/terminal.c.orig 2022-10-28 17:19:48.000000000 +0000 +++ terminal/terminal.c @@@@ -7508,8 +7508,17 @@@@ int format_small_keypad_key(char *buf, T } else { p += sprintf(p, "\x1B[%c", codes[code-1]); } - } else if ((code == 1 || code == 4) && term->rxvt_homeend) { - p += sprintf(p, code == 1 ? "\x1B[H" : "\x1BOw"); + } else if (code == 1 || code == 4) { + /* Home/End */ + /* Send the correct XTerm or rxvt codes for home/end + * We used to send ^[1~ and [4~ for Xterm, + * but those are Linux console */ + const char *he; + if (term->rxvt_homeend) + he = code == 1 ? "\x1B[7~" : "\x1B[8~"; + else + he = code == 1 ? "\x1BOH" : "\x1BOF"; + p += sprintf((char *) p, "%s", he); } else { if (term->vt52_mode) { p += sprintf(p, "\x1B[%d~", code); @ 1.6 log @putty: Update to 0.78 Changelog: These features are new in 0.78 (released 2022-10-29): Support for OpenSSH certificates, for both user authentication keys and host keys. New SSH proxy modes, for running a custom shell command or subsystem on the proxy server instead of forwarding a port through it. New plugin system to allow a helper program to provide responses in keyboard-interactive authentication, intended to automate one-time password systems. Support for NTRU Prime post-quantum key exchange, Support for AES-GCM (in the OpenSSH style rather than RFC 5647). Support for more forms of Diffie-Hellman key exchange: new larger integer groups (such as group16 and group18), and support for using those and ECDH with GSSAPI. SSH configuration panels slightly reorganised. In particular, the configuration option 'Private key file for authentication' has moved to a new 'Credentials' panel alongside controls for some of the above new features. Bug fix: the 32-bit Windows build now runs on Windows XP again. Bug fix: server-controlled window title setting now works again even if the character set is ISO 8859 (or a few other affected single-byte character sets). Bug fix: certain forms of OSC escape sequences (sent by some real servers) could cause PuTTY to crash. Bug fix: the -pwfile/-pw options no longer affect local key passphrase prompts, and no longer suppress Plink's anti-spoofing measures. Note: installing the 0.78 or later Windows installer will not automatically uninstall 0.77 or earlier, due to a change we've made to work around a bug. We recommend uninstalling the old version first, if possible. If both end up installed, uninstalling both and then re-installing the new version will fix things up. These features were new in 0.77 (released 2022-05-27): Major improvements to network proxy support: Support for interactively prompting the user if the proxy server requires authentication. Built-in support for proxying via another SSH server, so that PuTTY will SSH to the proxy and then automatically forward a port through it to the destination host. (Similar to running plink -nc as a subprocess, but more convenient to set up, and allows you to answer interactive prompts presented by the proxy.) Support for HTTP Digest authentication, when talking to HTTP proxies. Introduced pterm.exe, a PuTTY-like wrapper program for Windows command prompts (or anything else running in a Windows console). Not yet included in the installer, but available as a .exe file from the Download page. Updated Unicode and bidi support to Unicode 14.0.0. New command-line option -pwfile, like -pw except that it reads the password from a file so that it doesn't show up on the command line. Windows Pageant: option --openssh-config to allow easy interoperation with Windows's ssh.exe. -pw (and -pwfile) now do not fall back to interactively prompting for a password if the provided password fails. (That was the original intention.) New configuration options for keyboard handling: Option to control handling of Shift + arrow keys Extra mode in the function-keys option, for modern xterm (v216 and above). Bug workaround flag to wait for the server's SSH greeting before sending our own, for servers (or proxies) that lose outgoing data before seeing any incoming data. Crypto update: added side-channel resistance in probabilistic RSA key generation. Crypto update: retired the use of short Diffie-Hellman exponents (just in case). Bug fix: reconfiguring remote port forwardings more than once no longer crashes. Bug fix: terminal output processing is now paused while handling a remote-controlled terminal resize, so that the subsequent screen redraw is interpreted relative to the new terminal size instead of the old. Bug fix: Windows PuTTYgen's mouse-based entropy collection now handles high-frequency mice without getting confused. Bug fix: Windows Pageant can now handle large numbers of concurrent connections without hanging or crashing. Bug fix: if Windows Pageant is started multiple times simultaneously, the instances should reliably agree on one of them to be the persistent server. Bug fix: remote-controlled changes of window title are now interpreted according to the configured character set. Bug fix: remote-controlled changes of window title no longer get confused by UTF-8 characters whose encoding includes the byte 0x9C (which terminates the control sequence in non-UTF-8 contexts). Bug fix: popping up the window context menu in the middle of a drag-select now no longer leaves the drag in a stuck state. Bug fix: extensive use of true colour in the terminal no longer slows down window redraws unnecessarily. Bug fix: when PSCP reports the server sending a disallowed compound pathname, it correctly reports the replacement name it's using for the downloaded file. Bug fix: enabling X11 forwarding in psusan failed to fall back through possible port numbers for the forwarded X display. For developers: migrated the build system to CMake, removing the old idiosyncratic mkfiles.pl and the autotools system. @ text @d1 1 a1 1 $NetBSD: patch-terminal.c,v 1.5 2019/12/19 22:22:33 joerg Exp $ @ 1.5 log @Avoid using a non-literal string as format string. @ text @d1 1 a1 1 $NetBSD: patch-terminal.c,v 1.4 2019/04/01 12:10:43 ryoon Exp $ d5 3 a7 3 --- terminal.c.orig 2019-09-22 09:14:51.000000000 +0000 +++ terminal.c @@@@ -6892,8 +6892,17 @@@@ int format_small_keypad_key(char *buf, T d25 2 a26 2 p += sprintf(p, "\x1B[%d~", code); } @ 1.4 log @Update to 0.71 Changelog: These features were new in 0.70 (released 2017-07-08): Security fix: the Windows PuTTY binaries should no longer be vulnerable to hijacking by specially named DLLs in the same directory, even a name we missed when we thought we'd fixed this in 0.69. See vuln-indirect-dll-hijack-3. Windows PuTTY should be able to print again, after our DLL hijacking defences broke that functionality. Windows PuTTY should be able to accept keyboard input outside the current code page, after our DLL hijacking defences broke that too. These features are new in 0.71 (released 2019-03-16): Security fixes found by an EU-funded bug bounty programme: a remotely triggerable memory overwrite in RSA key exchange, which can occur before host key verification potential recycling of random numbers used in cryptography on Windows, hijacking by a malicious help file in the same directory as the executable on Unix, remotely triggerable buffer overflow in any kind of server-to-client forwarding multiple denial-of-service attacks that can be triggered by writing to the terminal Other security enhancements: major rewrite of the crypto code to remove cache and timing side channels. User interface changes to protect against fake authentication prompts from a malicious server. We now provide pre-built binaries for Windows on Arm. Hardware-accelerated versions of the most common cryptographic primitives: AES, SHA-256, SHA-1. GTK PuTTY now supports non-X11 displays (e.g. Wayland) and high-DPI configurations. Type-ahead now works as soon as a PuTTY window is opened: keystrokes typed before authentication has finished will be buffered instead of being dropped. Support for GSSAPI key exchange: an alternative to the older GSSAPI authentication system which can keep your forwarded Kerberos credentials updated during a long session. More choices of user interface for clipboard handling. New terminal features: support the REP escape sequence (fixing an ncurses screen redraw failure), true colour, and SGR 2 dim text. Pressing Ctrl+Shift+PgUp or Ctrl+Shift+PgDn now takes you straight to the top or bottom of the terminal scrollback. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- terminal.c.orig 2019-03-31 15:56:54.023245872 +0000 d7 1 a7 1 @@@@ -6746,8 +6746,17 @@@@ int format_small_keypad_key(char *buf, T d23 1 a23 1 + p += sprintf((char *) p, he); @ 1.3 log @update to 0.63 This fixes a buffer overflow which was patched in pkgsrc (CVE-2013-4852), two other buffer overflows (CVE-2013-4206, CVE-2013-4207), and it clears private keys after use now (CVE-2013-4208). Other than that, there are mostly bug fixes from 0.62 and a few small features. @ text @d1 1 a1 1 $NetBSD: patch-terminal.c,v 1.2 2012/11/01 19:32:44 joerg Exp $ d5 1 a5 1 --- terminal.c.orig 2011-07-16 11:27:05.000000000 +0000 d7 7 a13 18 @@@@ -6202,13 +6202,6 @@@@ void term_key(Terminal *term, Key_Sym ke } } - /* RXVT Home/End */ - if (term->cfg.rxvt_homeend && - (keysym == PK_HOME || keysym == PK_END)) { - p += sprintf((char *) p, keysym == PK_HOME ? "\x1B[H" : "\x1BOw"); - goto done; - } - if (term->vt52_mode) { int xkey; @@@@ -6229,11 +6222,23 @@@@ void term_key(Terminal *term, Key_Sym ke goto done; } d15 12 a26 21 + if (keysym == PK_HOME || keysym == PK_END) { + /* Send the correct XTerm or rxvt codes for home/end + * We used to send ^[1~ and [4~ for Xterm, + * but those are Linux console */ + const char *he; + if (term->cfg.rxvt_homeend) + he = keysym == PK_HOME ? "\x1B[7~" : "\x1B[8~"; + else + he = keysym == PK_HOME ? "\x1BOH" : "\x1BOF"; + p += sprintf((char *) p, "%s", he); + goto done; + } + switch (keysym) { - case PK_HOME: code = 1; break; case PK_INSERT: code = 2; break; case PK_DELETE: code = 3; break; - case PK_END: code = 4; break; case PK_PAGEUP: code = 5; break; case PK_PAGEDOWN: code = 6; break; default: code = 0; break; /* else gcc warns `enum value not used' */ @ 1.2 log @Don't order function pointers directly. Don't use non-literals as format strings. Fix return type of intermediate used for return value of wcrtomb. @ text @d1 1 a1 1 $NetBSD: patch-terminal.c,v 1.1 2012/02/22 15:27:16 wiz Exp $ @ 1.2.6.1 log @Pullup ticket #4216 - requested by drochner security/putty: security update Revisions pulled up: - security/putty/Makefile 1.34-1.35 - security/putty/distinfo 1.14-1.15 - security/putty/patches/patch-CVE-2013-4852-1 deleted - security/putty/patches/patch-CVE-2013-4852-2 deleted - security/putty/patches/patch-import.c 1.2-1.3 - security/putty/patches/patch-terminal.c deleted - security/putty/patches/patch-timing.c 1.2 - security/putty/patches/patch-unix_gtkfont_c deleted - security/putty/patches/patch-unix_gtkwin.c 1.3 - security/putty/patches/patch-unix_uxnet.c 1.2 - security/putty/patches/patch-unix_uxucs.c 1.2 - security/putty/patches/patch-windows_window.c 1.2 --- Module Name: pkgsrc Committed By: drochner Date: Tue Aug 6 12:23:37 UTC 2013 Modified Files: pkgsrc/security/putty: Makefile distinfo pkgsrc/security/putty/patches: patch-import.c Added Files: pkgsrc/security/putty/patches: patch-CVE-2013-4852-1 patch-CVE-2013-4852-2 Log Message: add patch from upstream to fix possible heap overflow in SSH handshake due to integer overflow (CVE-2013-4852) bump PKGREV --- Module Name: pkgsrc Committed By: drochner Date: Wed Aug 7 11:06:39 UTC 2013 Modified Files: pkgsrc/security/putty: Makefile distinfo pkgsrc/security/putty/patches: patch-import.c patch-timing.c patch-unix_gtkwin.c patch-unix_uxnet.c patch-unix_uxucs.c patch-windows_window.c Removed Files: pkgsrc/security/putty/patches: patch-CVE-2013-4852-1 patch-CVE-2013-4852-2 patch-terminal.c patch-unix_gtkfont_c Log Message: update to 0.63 This fixes a buffer overflow which was patched in pkgsrc (CVE-2013-4852), two other buffer overflows (CVE-2013-4206, CVE-2013-4207), and it clears private keys after use now (CVE-2013-4208). Other than that, there are mostly bug fixes from 0.62 and a few small features. @ text @d1 1 a1 1 $NetBSD: patch-terminal.c,v 1.2 2012/11/01 19:32:44 joerg Exp $ @ 1.1 log @Update to 0.62, keeping all pkgsrc patches which have not been fed upstream (hi roy! hi rillig!) 2011-12-10 PuTTY 0.62 released PuTTY 0.62 is out, containing only bug fixes from 0.61, in particular a security fix preventing passwords from being accidentally retained in memory. 2011-11-27 PuTTY 0.62 pre-release builds available PuTTY 0.61 had a few noticeable bugs in it (but nothing security-related), so we are planning to make a 0.62 release containing just bug fixes. The Wishlist page lists the bugs that will be fixed by the 0.62 release. The Download page now contains pre-release snapshots of 0.62, which contain those bug fixes and should be otherwise stable. (The usual development snapshots, containing other development since 0.61, are also still available.) 2011-07-12 PuTTY 0.61 is released PuTTY 0.61 is out, after over four years (sorry!), with new features, bug fixes, and compatibility updates for Windows 7 and various SSH server software. @ text @d1 1 a1 1 $NetBSD$ d35 1 a35 1 + p += sprintf((char *) p, he); @ 1.1.2.1 log @file patch-terminal.c was added on branch pkgsrc-2011Q4 on 2012-02-23 15:53:56 +0000 @ text @d1 46 @ 1.1.2.2 log @Pullup ticket #3689 - requested by wiz security/putty: security update security/putty-devel: removed Revisions pulled up: - doc/CHANGES-2012 1.565 - security/Makefile 1.426 - security/putty-devel/DESCR deleted - security/putty-devel/Makefile deleted - security/putty-devel/PLIST deleted - security/putty-devel/distinfo deleted - security/putty-devel/patches/patch-aa deleted - security/putty-devel/patches/patch-ak deleted - security/putty-devel/patches/patch-al deleted - security/putty-devel/patches/patch-am deleted - security/putty-devel/patches/patch-an deleted - security/putty-devel/patches/patch-ldisc.c deleted - security/putty/Makefile 1.23 - security/putty/distinfo 1.10-1.11 - security/putty/options.mk 1.1 - security/putty/patches/patch-aa deleted - security/putty/patches/patch-ac deleted - security/putty/patches/patch-ad deleted - security/putty/patches/patch-ae deleted - security/putty/patches/patch-af deleted - security/putty/patches/patch-ag deleted - security/putty/patches/patch-ai deleted - security/putty/patches/patch-aj deleted - security/putty/patches/patch-ak deleted - security/putty/patches/patch-al deleted - security/putty/patches/patch-am deleted - security/putty/patches/patch-an deleted - security/putty/patches/patch-import.c 1.1 - security/putty/patches/patch-ldisc.c 1.1 - security/putty/patches/patch-terminal.c 1.1 - security/putty/patches/patch-unix_Makefile.gtk 1.1 - security/putty/patches/patch-unix_gtkwin.c 1.1 - security/putty/patches/patch-unix_uxnet.c 1.1 - security/putty/patches/patch-windows_window.c 1.1 --- Module Name: pkgsrc Committed By: wiz Date: Wed Feb 22 15:27:17 UTC 2012 Modified Files: pkgsrc/security/putty: Makefile distinfo Added Files: pkgsrc/security/putty: options.mk pkgsrc/security/putty/patches: patch-import.c patch-terminal.c patch-unix_Makefile.gtk patch-unix_gtkwin.c patch-unix_uxnet.c patch-windows_window.c Removed Files: pkgsrc/security/putty/patches: patch-aa patch-ac patch-ad patch-ae patch-af patch-ag patch-ai patch-aj patch-ak patch-al patch-am patch-an Log Message: Update to 0.62, keeping all pkgsrc patches which have not been fed upstream (hi roy! hi rillig!) 2011-12-10 PuTTY 0.62 released PuTTY 0.62 is out, containing only bug fixes from 0.61, in particular a security fix preventing passwords from being accidentally retained in memory. 2011-11-27 PuTTY 0.62 pre-release builds available PuTTY 0.61 had a few noticeable bugs in it (but nothing security-related), so we are planning to make a 0.62 release containing just bug fixes. The Wishlist page lists the bugs that will be fixed by the 0.62 release. The Download page now contains pre-release snapshots of 0.62, which contain those bug fixes and should be otherwise stable. (The usual development snapshots, containing other development since 0.61, are also still available.) 2011-07-12 PuTTY 0.61 is released PuTTY 0.61 is out, after over four years (sorry!), with new features, bug fixes, and compatibility updates for Windows 7 and various SSH server software. --- Module Name: pkgsrc Committed By: wiz Date: Wed Feb 22 15:30:21 UTC 2012 Modified Files: pkgsrc/security/putty: distinfo Added Files: pkgsrc/security/putty/patches: patch-ldisc.c Log Message: Add a patch from the putty-devel package (not needed on my -current though) --- Module Name: pkgsrc Committed By: wiz Date: Wed Feb 22 15:31:06 UTC 2012 Modified Files: pkgsrc/doc: CHANGES-2012 pkgsrc/security: Makefile Removed Files: pkgsrc/security/putty-devel: DESCR Makefile PLIST distinfo pkgsrc/security/putty-devel/patches: patch-aa patch-ak patch-al patch-am patch-an patch-ldisc.c Log Message: Remove putty-devel, older than putty now. @ text @a0 46 $NetBSD$ Make the home/end keys work on BSD servers as well as Linux ones --- terminal.c.orig 2011-07-16 11:27:05.000000000 +0000 +++ terminal.c @@@@ -6202,13 +6202,6 @@@@ void term_key(Terminal *term, Key_Sym ke } } - /* RXVT Home/End */ - if (term->cfg.rxvt_homeend && - (keysym == PK_HOME || keysym == PK_END)) { - p += sprintf((char *) p, keysym == PK_HOME ? "\x1B[H" : "\x1BOw"); - goto done; - } - if (term->vt52_mode) { int xkey; @@@@ -6229,11 +6222,23 @@@@ void term_key(Terminal *term, Key_Sym ke goto done; } + /* Home/End */ + if (keysym == PK_HOME || keysym == PK_END) { + /* Send the correct XTerm or rxvt codes for home/end + * We used to send ^[1~ and [4~ for Xterm, + * but those are Linux console */ + const char *he; + if (term->cfg.rxvt_homeend) + he = keysym == PK_HOME ? "\x1B[7~" : "\x1B[8~"; + else + he = keysym == PK_HOME ? "\x1BOH" : "\x1BOF"; + p += sprintf((char *) p, he); + goto done; + } + switch (keysym) { - case PK_HOME: code = 1; break; case PK_INSERT: code = 2; break; case PK_DELETE: code = 3; break; - case PK_END: code = 4; break; case PK_PAGEUP: code = 5; break; case PK_PAGEDOWN: code = 6; break; default: code = 0; break; /* else gcc warns `enum value not used' */ @