From c767b9fed6aeb8db3df1b71524b5bea3c5958840e6196b7a51b010911c1fb180 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 17 Mar 2019 11:40:14 +0000
Subject: [PATCH] - Update to new upstream release 0.71

OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=53
---
 putty-0.70.tar.gz     |   3 -
 putty-0.70.tar.gz.gpg | Bin 287 -> 0 bytes
 putty-0.71.tar.gz     |   3 +
 putty-0.71.tar.gz.gpg | Bin 0 -> 438 bytes
 putty-03-config.diff  | 130 +++++++++++++++++++++---------------------
 putty.changes         |  14 +++++
 putty.spec            |   6 +-
 7 files changed, 85 insertions(+), 71 deletions(-)
 delete mode 100644 putty-0.70.tar.gz
 delete mode 100644 putty-0.70.tar.gz.gpg
 create mode 100644 putty-0.71.tar.gz
 create mode 100644 putty-0.71.tar.gz.gpg

diff --git a/putty-0.70.tar.gz b/putty-0.70.tar.gz
deleted file mode 100644
index b8380da..0000000
--- a/putty-0.70.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be
-size 2386108
diff --git a/putty-0.70.tar.gz.gpg b/putty-0.70.tar.gz.gpg
deleted file mode 100644
index 1e07495f681f992582bc68c727e2b38d070d0647655e87e13eff654af3f2c026..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 287
zcmV+)0pR|L0UQJX0SEvF1p--MfQkSL2@swBCP=h2G~_>J2me#pRU$I$O&d%Rg58Vz
zeighjpY5K?MS02)((h_^R8@{C&}=e96@u?mhpR$^Kxj^F_b!Y}3G4e4R7k&kTTb0z
z8tm)Z9%K@La&uuRp)K4)aj<aE=#dhg0pC%!6VS8twet;i>v4R-+d`Vx70w<UZd?`;
zUiP=cLi%*}$=%uKDMl@xFKCqd<f)SbRrMWHEtxs{EuWp8(6eFo<b+Qmx9-T0N5IWw
zvD2tQ3|8(y?2#nUGoG55>vwx1?OeJki7fU@YxWlf3r+)|hMj1&sX@#%-wv{SNW>W$
lzg6oZt0~A!_Vqe(IKMOWEzk=!;RpWDh0@+#s{H!3bqd#eil+bo

diff --git a/putty-0.71.tar.gz b/putty-0.71.tar.gz
new file mode 100644
index 0000000..e743986
--- /dev/null
+++ b/putty-0.71.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f931ce2f89780cc8ca7bbed90fcd22c44515d2773f5fa954069e209b48ec6b8
+size 2423752
diff --git a/putty-0.71.tar.gz.gpg b/putty-0.71.tar.gz.gpg
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..bd259bb88604d9e5545f0e68e7eb9ae6c1d2b12dfa6e909d5cfde4e0a9b1ba2a
GIT binary patch
literal 438
zcmV;n0ZIOe0kZ@E0SEvc79j-UbCj&3`Pl@OBH&bFiK1Uh=-Pq>0$hzIS^x?O5Mqg<
zUrOlOf*x=T0FgqKU1cOer3}VF{xrfC3#!cfm-M6rhiOV>Ip|4g3_hlJOxD^O=rtvv
zR=fcZn}8@Zl}5xdhwYf)o3!rB$xm=PEfhRJ7{Bn;u%~;IOxKpbhw%6CPnGLDQ&97G
z54yAHCZM8*?HYbHLD48QSv8)(V^#H1oCMGE<{2=<x@RGwBDSVx?6I=|Ug^MV!$IS4
zYuUv|YX#-sojBy@;F8Fu&nnk;SUsJ~@(GbYadtV9v~0ZmQPCDi>c*@TPryz@#CoMP
z@|8tH!u~Rx{d<)$Ch*1~O|in2!3?z$<iG<u*n1`lq3}|XZGAgh#+tB=H>($Txy?tY
zt!<96OEUb}!Txj!Bp?4}e^5qR0!YzTa9Kc=PSA?=>%Z*Un`m)$IJEvpVsKeJx_0U{
z5$n1S7YKJi>z6nJqWE{_cltl_4k~P`>X=WnhCopcqbHllPkm*Qcm1;8T*bzN|8_Pu
g0{%1H8BDshZrUPj=0<^}Z*MxjR9^9pxk<ve_2s?UVE_OC

literal 0
HcmV?d00001

diff --git a/putty-03-config.diff b/putty-03-config.diff
index ce750df..65334a3 100644
--- a/putty-03-config.diff
+++ b/putty-03-config.diff
@@ -5,81 +5,80 @@
 * Set standard colors and use a more legilible font size.
 
 ---
- settings.c        |   51 ++++++++++++++++++++++++++++++++++-----------------
+ settings.c        |   49 +++++++++++++++++++++++++++++++++----------------
  unix/unix.h       |    6 +-----
  windows/windefs.c |    2 +-
- 3 files changed, 36 insertions(+), 23 deletions(-)
+ 3 files changed, 35 insertions(+), 22 deletions(-)
 
-Index: putty-0.69/settings.c
+Index: putty-0.71/settings.c
 ===================================================================
---- putty-0.69.orig/settings.c
-+++ putty-0.69/settings.c
-@@ -13,8 +13,8 @@ static const struct keyvalwhere cipherna
+--- putty-0.71.orig/settings.c
++++ putty-0.71/settings.c
+@@ -17,8 +17,8 @@
+ static const struct keyvalwhere ciphernames[] = {
      { "aes",        CIPHER_AES,             -1, -1 },
      { "chacha20",   CIPHER_CHACHA20,        CIPHER_AES, +1 },
-     { "blowfish",   CIPHER_BLOWFISH,        -1, -1 },
 -    { "3des",       CIPHER_3DES,            -1, -1 },
      { "WARN",       CIPHER_WARN,            -1, -1 },
 +    { "3des",       CIPHER_3DES,            -1, -1 },
+     { "des",        CIPHER_DES,             -1, -1 },
+     { "blowfish",   CIPHER_BLOWFISH,        -1, -1 },
      { "arcfour",    CIPHER_ARCFOUR,         -1, -1 },
-     { "des",        CIPHER_DES,             -1, -1 }
- };
-@@ -749,7 +749,7 @@ void load_open_settings(void *sesskey, C
+@@ -843,7 +843,7 @@ void load_open_settings(settings_r *sess
      }
-     gppi(sesskey, "TCPNoDelay", 1, conf, CONF_tcp_nodelay);
-     gppi(sesskey, "TCPKeepalives", 0, conf, CONF_tcp_keepalives);
+     gppb(sesskey, "TCPNoDelay", true, conf, CONF_tcp_nodelay);
+     gppb(sesskey, "TCPKeepalives", false, conf, CONF_tcp_keepalives);
 -    gpps(sesskey, "TerminalType", "xterm", conf, CONF_termtype);
 +    gpps(sesskey, "TerminalType", "linux", conf, CONF_termtype);
      gpps(sesskey, "TerminalSpeed", "38400,38400", conf, CONF_termspeed);
      if (gppmap(sesskey, "TerminalModes", conf, CONF_ttymodes)) {
  	/*
-@@ -917,10 +917,10 @@ void load_open_settings(void *sesskey, C
-     gppi(sesskey, "PassiveTelnet", 0, conf, CONF_passive_telnet);
-     gppi(sesskey, "BackspaceIsDelete", 1, conf, CONF_bksp_is_delete);
-     gppi(sesskey, "RXVTHomeEnd", 0, conf, CONF_rxvt_homeend);
+@@ -1021,10 +1021,10 @@ void load_open_settings(settings_r *sess
+     gppb(sesskey, "PassiveTelnet", false, conf, CONF_passive_telnet);
+     gppb(sesskey, "BackspaceIsDelete", true, conf, CONF_bksp_is_delete);
+     gppb(sesskey, "RXVTHomeEnd", false, conf, CONF_rxvt_homeend);
 -    gppi(sesskey, "LinuxFunctionKeys", 0, conf, CONF_funky_type);
-+    gppi(sesskey, "LinuxFunctionKeys", 1, conf, CONF_funky_type);
-     gppi(sesskey, "NoApplicationKeys", 0, conf, CONF_no_applic_k);
-     gppi(sesskey, "NoApplicationCursors", 0, conf, CONF_no_applic_c);
--    gppi(sesskey, "NoMouseReporting", 0, conf, CONF_no_mouse_rep);
-+    gppi(sesskey, "NoMouseReporting", 1, conf, CONF_no_mouse_rep);
-     gppi(sesskey, "NoRemoteResize", 0, conf, CONF_no_remote_resize);
-     gppi(sesskey, "NoAltScreen", 0, conf, CONF_no_alt_screen);
-     gppi(sesskey, "NoRemoteWinTitle", 0, conf, CONF_no_remote_wintitle);
-@@ -941,9 +941,9 @@ void load_open_settings(void *sesskey, C
-     gppi(sesskey, "ApplicationKeypad", 0, conf, CONF_app_keypad);
-     gppi(sesskey, "NetHackKeypad", 0, conf, CONF_nethack_keypad);
-     gppi(sesskey, "AltF4", 1, conf, CONF_alt_f4);
--    gppi(sesskey, "AltSpace", 0, conf, CONF_alt_space);
-+    gppi(sesskey, "AltSpace", 1, conf, CONF_alt_space);
-     gppi(sesskey, "AltOnly", 0, conf, CONF_alt_only);
--    gppi(sesskey, "ComposeKey", 0, conf, CONF_compose_key);
-+    gppi(sesskey, "ComposeKey", 1, conf, CONF_compose_key);
-     gppi(sesskey, "CtrlAltKeys", 1, conf, CONF_ctrlaltkeys);
++    gppi(sesskey, "LinuxFunctionKeys", true, conf, CONF_funky_type);
+     gppb(sesskey, "NoApplicationKeys", false, conf, CONF_no_applic_k);
+     gppb(sesskey, "NoApplicationCursors", false, conf, CONF_no_applic_c);
+-    gppb(sesskey, "NoMouseReporting", false, conf, CONF_no_mouse_rep);
++    gppb(sesskey, "NoMouseReporting", true, conf, CONF_no_mouse_rep);
+     gppb(sesskey, "NoRemoteResize", false, conf, CONF_no_remote_resize);
+     gppb(sesskey, "NoAltScreen", false, conf, CONF_no_alt_screen);
+     gppb(sesskey, "NoRemoteWinTitle", false, conf, CONF_no_remote_wintitle);
+@@ -1046,9 +1046,9 @@ void load_open_settings(settings_r *sess
+     gppb(sesskey, "ApplicationKeypad", false, conf, CONF_app_keypad);
+     gppb(sesskey, "NetHackKeypad", false, conf, CONF_nethack_keypad);
+     gppb(sesskey, "AltF4", true, conf, CONF_alt_f4);
+-    gppb(sesskey, "AltSpace", false, conf, CONF_alt_space);
++    gppb(sesskey, "AltSpace", true, conf, CONF_alt_space);
+     gppb(sesskey, "AltOnly", false, conf, CONF_alt_only);
+-    gppb(sesskey, "ComposeKey", false, conf, CONF_compose_key);
++    gppb(sesskey, "ComposeKey", true, conf, CONF_compose_key);
+     gppb(sesskey, "CtrlAltKeys", true, conf, CONF_ctrlaltkeys);
  #ifdef OSX_META_KEY_CONFIG
-     gppi(sesskey, "OSXOptionMeta", 1, conf, CONF_osx_option_meta);
-@@ -955,12 +955,12 @@ void load_open_settings(void *sesskey, C
+     gppb(sesskey, "OSXOptionMeta", true, conf, CONF_osx_option_meta);
+@@ -1060,12 +1060,12 @@ void load_open_settings(settings_r *sess
      gppi(sesskey, "LocalEdit", AUTO, conf, CONF_localedit);
      gpps(sesskey, "Answerback", "PuTTY", conf, CONF_answerback);
-     gppi(sesskey, "AlwaysOnTop", 0, conf, CONF_alwaysontop);
--    gppi(sesskey, "FullScreenOnAltEnter", 0, conf, CONF_fullscreenonaltenter);
-+    gppi(sesskey, "FullScreenOnAltEnter", 1, conf, CONF_fullscreenonaltenter);
-     gppi(sesskey, "HideMousePtr", 0, conf, CONF_hide_mouseptr);
-     gppi(sesskey, "SunkenEdge", 0, conf, CONF_sunken_edge);
+     gppb(sesskey, "AlwaysOnTop", false, conf, CONF_alwaysontop);
+-    gppb(sesskey, "FullScreenOnAltEnter", false,
++    gppb(sesskey, "FullScreenOnAltEnter", true,
+          conf, CONF_fullscreenonaltenter);
+     gppb(sesskey, "HideMousePtr", false, conf, CONF_hide_mouseptr);
+     gppb(sesskey, "SunkenEdge", false, conf, CONF_sunken_edge);
      gppi(sesskey, "WindowBorder", 1, conf, CONF_window_border);
 -    gppi(sesskey, "CurType", 0, conf, CONF_cursor_type);
--    gppi(sesskey, "BlinkCur", 0, conf, CONF_blink_cur);
 +    gppi(sesskey, "CurType", 1, conf, CONF_cursor_type);
-+    gppi(sesskey, "BlinkCur", 1, conf, CONF_blink_cur);
+     gppb(sesskey, "BlinkCur", false, conf, CONF_blink_cur);
      /* pedantic compiler tells me I can't use conf, CONF_beep as an int * :-) */
      gppi(sesskey, "Beep", 1, conf, CONF_beep);
-     gppi(sesskey, "BeepInd", 0, conf, CONF_beep_ind);
-@@ -994,10 +994,10 @@ void load_open_settings(void *sesskey, C
-     gppi(sesskey, "CRImpliesLF", 0, conf, CONF_crhaslf);
-     gppi(sesskey, "DisableArabicShaping", 0, conf, CONF_arabicshaping);
-     gppi(sesskey, "DisableBidi", 0, conf, CONF_bidi);
--    gppi(sesskey, "WinNameAlways", 1, conf, CONF_win_name_always);
-+    gppi(sesskey, "WinNameAlways", 0, conf, CONF_win_name_always);
+@@ -1100,10 +1100,10 @@ void load_open_settings(settings_r *sess
+     gppb(sesskey, "CRImpliesLF", false, conf, CONF_crhaslf);
+     gppb(sesskey, "DisableArabicShaping", false, conf, CONF_arabicshaping);
+     gppb(sesskey, "DisableBidi", false, conf, CONF_bidi);
+-    gppb(sesskey, "WinNameAlways", true, conf, CONF_win_name_always);
++    gppb(sesskey, "WinNameAlways", false, conf, CONF_win_name_always);
      gpps(sesskey, "WinTitle", "", conf, CONF_wintitle);
      gppi(sesskey, "TermWidth", 80, conf, CONF_width);
 -    gppi(sesskey, "TermHeight", 24, conf, CONF_height);
@@ -87,7 +86,7 @@ Index: putty-0.69/settings.c
      gppfont(sesskey, "Font", conf, CONF_font);
      gppi(sesskey, "FontQuality", FQ_DEFAULT, conf, CONF_font_quality);
      gppi(sesskey, "FontVTMode", VT_UNICODE, conf, CONF_vtmode);
-@@ -1009,11 +1009,28 @@ void load_open_settings(void *sesskey, C
+@@ -1116,11 +1116,28 @@ void load_open_settings(settings_r *sess
  
      for (i = 0; i < 22; i++) {
  	static const char *const defaults[] = {
@@ -121,20 +120,20 @@ Index: putty-0.69/settings.c
  	};
  	char buf[20], *buf2;
  	int c0, c1, c2;
-@@ -1061,7 +1078,7 @@ void load_open_settings(void *sesskey, C
+@@ -1178,7 +1195,7 @@ void load_open_settings(settings_r *sess
       * The empty default for LineCodePage will be converted later
       * into a plausible default for the locale.
       */
 -    gpps(sesskey, "LineCodePage", "", conf, CONF_line_codepage);
 +    gpps(sesskey, "LineCodePage", "UTF-8", conf, CONF_line_codepage);
-     gppi(sesskey, "CJKAmbigWide", 0, conf, CONF_cjk_ambig_wide);
-     gppi(sesskey, "UTF8Override", 1, conf, CONF_utf8_override);
+     gppb(sesskey, "CJKAmbigWide", false, conf, CONF_cjk_ambig_wide);
+     gppb(sesskey, "UTF8Override", true, conf, CONF_utf8_override);
      gpps(sesskey, "Printer", "", conf, CONF_printer);
-Index: putty-0.69/unix/unix.h
+Index: putty-0.71/unix/unix.h
 ===================================================================
---- putty-0.69.orig/unix/unix.h
-+++ putty-0.69/unix/unix.h
-@@ -257,10 +257,6 @@ int so_peercred(int fd, int *pid, int *u
+--- putty-0.71.orig/unix/unix.h
++++ putty-0.71/unix/unix.h
+@@ -399,11 +399,7 @@ Socket *make_fd_socket(int infd, int out
  /*
   * Default font setting, which can vary depending on NOT_X_WINDOWS.
   */
@@ -145,17 +144,18 @@ Index: putty-0.69/unix/unix.h
 -#endif
 +#define DEFAULT_GTK_FONT "client:Monospace 14"
  
- #endif
-Index: putty-0.69/windows/windefs.c
+ /*
+  * uxpty.c.
+Index: putty-0.71/windows/windefs.c
 ===================================================================
---- putty-0.69.orig/windows/windefs.c
-+++ putty-0.69/windows/windefs.c
+--- putty-0.71.orig/windows/windefs.c
++++ putty-0.71/windows/windefs.c
 @@ -9,7 +9,7 @@
  FontSpec *platform_default_fontspec(const char *name)
  {
      if (!strcmp(name, "Font"))
--        return fontspec_new("Courier New", 0, 10, ANSI_CHARSET);
-+        return fontspec_new("Ludica Console", 0, 14, ANSI_CHARSET);
+-        return fontspec_new("Courier New", false, 10, ANSI_CHARSET);
++        return fontspec_new("Consolas", false, 14, ANSI_CHARSET);
      else
-         return fontspec_new("", 0, 0, 0);
+         return fontspec_new("", false, 0, 0);
  }
diff --git a/putty.changes b/putty.changes
index f6b3557..73f6cf5 100644
--- a/putty.changes
+++ b/putty.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sun Mar 17 11:28:14 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to new upstream release 0.71
+  * Fixed a remotely triggerable memory overwrite in RSA key
+    exchange, which can occur before host key verification
+    potential recycling of random numbers used in cryptography.
+  * Fixed a remotely triggerable buffer overflow in any kind of
+    server-to-client forwarding.
+  * Fixed multiple denial-of-service attacks that can be triggered
+    by writing to the terminal.
+  * Major rewrite of the crypto code to remove cache and timing
+    side channels.
+
 -------------------------------------------------------------------
 Thu Jun  7 03:56:51 UTC 2018 - jnwang@suse.com
 
diff --git a/putty.spec b/putty.spec
index 403d3a1..b9dff4f 100644
--- a/putty.spec
+++ b/putty.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package putty
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,12 +12,12 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           putty
-Version:        0.70
+Version:        0.71
 Release:        0
 Summary:        GTK-based terminal emulator program
 License:        MIT