Hello community,
here is the log from the commit of package filezilla for openSUSE:Factory
checked in at 2019-03-19 10:03:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/filezilla (Old)
and /work/SRC/openSUSE:Factory/.filezilla.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "filezilla"
Tue Mar 19 10:03:36 2019 rev:74 rq:686305 version:3.41.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/filezilla/filezilla.changes 2019-03-10
09:39:07.100122461 +0100
+++ /work/SRC/openSUSE:Factory/.filezilla.new.28833/filezilla.changes
2019-03-19 10:03:42.959762330 +0100
@@ -1,0 +2,8 @@
+Mon Mar 18 21:07:08 UTC 2019 - Michael Ströder <mich...@stroeder.com>
+
+- Update to 3.41.2
+ Backport a security fix from PuTTY 0.71 affecting SFTP connections:
+ Fix an integer overflow in the RSA key exchange preceeding
+ host key verification
+
+-------------------------------------------------------------------
Old:
----
FileZilla_3.41.1_src.tar.bz2
New:
----
FileZilla_3.41.2_src.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ filezilla.spec ++++++
--- /var/tmp/diff_new_pack.rDIiEm/_old 2019-03-19 10:03:43.623761718 +0100
+++ /var/tmp/diff_new_pack.rDIiEm/_new 2019-03-19 10:03:43.627761714 +0100
@@ -17,7 +17,7 @@
Name: filezilla
-Version: 3.41.1
+Version: 3.41.2
Release: 0
Summary: A GUI FTP and SFTP Client
License: GPL-2.0-or-later
++++++ FileZilla_3.41.1_src.tar.bz2 -> FileZilla_3.41.2_src.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/filezilla-3.41.1/NEWS new/filezilla-3.41.2/NEWS
--- old/filezilla-3.41.1/NEWS 2019-03-06 20:10:11.000000000 +0100
+++ new/filezilla-3.41.2/NEWS 2019-03-18 15:06:46.000000000 +0100
@@ -10,6 +10,10 @@
*nix: Unix (e.g BSD) and Unix-like systems (e.g. Linux)
OS X: Apple Mac OS X
+3.41.2 (2019-03-18)
+
+! Backport a security from PuTTY 0.71 affecting SFTP connections: Fix an
integer overflow in the RSA key exchange preceeding host key verification
+
3.41.1 (2019-03-06)
- Fix a regression introduced in 3.41.1 with slow FTP servers needlessly
waiting for a bidirectional shutdown of the data connection during downloads
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/filezilla-3.41.1/configure
new/filezilla-3.41.2/configure
--- old/filezilla-3.41.1/configure 2019-03-06 20:11:36.000000000 +0100
+++ new/filezilla-3.41.2/configure 2019-03-18 15:08:42.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for FileZilla 3.41.1.
+# Generated by GNU Autoconf 2.69 for FileZilla 3.41.2.
#
# Report bugs to <tim.ko...@filezilla-project.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='FileZilla'
PACKAGE_TARNAME='filezilla'
-PACKAGE_VERSION='3.41.1'
-PACKAGE_STRING='FileZilla 3.41.1'
+PACKAGE_VERSION='3.41.2'
+PACKAGE_STRING='FileZilla 3.41.2'
PACKAGE_BUGREPORT='tim.ko...@filezilla-project.org'
PACKAGE_URL='https://filezilla-project.org/'
@@ -1465,7 +1465,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures FileZilla 3.41.1 to adapt to many kinds of systems.
+\`configure' configures FileZilla 3.41.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1536,7 +1536,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of FileZilla 3.41.1:";;
+ short | recursive ) echo "Configuration of FileZilla 3.41.2:";;
esac
cat <<\_ACEOF
@@ -1718,7 +1718,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-FileZilla configure 3.41.1
+FileZilla configure 3.41.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2383,7 +2383,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by FileZilla $as_me 3.41.1, which was
+It was created by FileZilla $as_me 3.41.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3249,7 +3249,7 @@
# Define the identity of the package.
PACKAGE='filezilla'
- VERSION='3.41.1'
+ VERSION='3.41.2'
cat >>confdefs.h <<_ACEOF
@@ -22349,7 +22349,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by FileZilla $as_me 3.41.1, which was
+This file was extended by FileZilla $as_me 3.41.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22416,7 +22416,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-FileZilla config.status 3.41.1
+FileZilla config.status 3.41.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/filezilla-3.41.1/configure.ac
new/filezilla-3.41.2/configure.ac
--- old/filezilla-3.41.1/configure.ac 2019-03-06 20:10:21.000000000 +0100
+++ new/filezilla-3.41.2/configure.ac 2019-03-18 15:06:43.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT([FileZilla],[3.41.1],[tim.ko...@filezilla-project.org],[],[https://filezilla-project.org/])
+AC_INIT([FileZilla],[3.41.2],[tim.ko...@filezilla-project.org],[],[https://filezilla-project.org/])
AC_CONFIG_HEADERS([src/include/config.h])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR(config)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/filezilla-3.41.1/locales/filezilla.pot
new/filezilla-3.41.2/locales/filezilla.pot
--- old/filezilla-3.41.1/locales/filezilla.pot 2019-03-06 20:11:44.000000000
+0100
+++ new/filezilla-3.41.2/locales/filezilla.pot 2019-03-18 15:08:50.000000000
+0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://trac.filezilla-project.org/\n";
-"POT-Creation-Date: 2019-03-06 20:11+0100\n"
+"POT-Creation-Date: 2019-03-18 15:08+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
@@ -46,20 +46,20 @@
msgstr[0] ""
msgstr[1] ""
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1491
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:875
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1263
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1491
#, c-format
msgid "%d directory with its contents"
msgid_plural "%d directories with their contents"
msgstr[0] ""
msgstr[1] ""
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1490
#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:50
#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:75
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:874
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1262
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1490
#, c-format
msgid "%d file"
msgid_plural "%d files"
@@ -266,8 +266,8 @@
msgstr ""
#:
../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1055
-#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:118
#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:563
+#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:118
msgid "&Auto"
msgstr ""
@@ -280,8 +280,8 @@
msgstr ""
#:
../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1070
-#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:120
#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:565
+#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:120
msgid "&Binary"
msgstr ""
@@ -474,10 +474,10 @@
msgid "&Edit filter rules..."
msgstr ""
+#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:553
#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2411
#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:89
#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:128
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:553
msgid "&Enable"
msgstr ""
@@ -514,8 +514,8 @@
msgid "&Export Site Manager entries"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:57
#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1754
+#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:57
msgid "&Export..."
msgstr ""
@@ -610,8 +610,8 @@
#:
../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2637
#:
../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:156
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:41
#: ../../source/FileZilla3/locales/../src/interface/sitemanager_site.cpp:270
+#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:41
msgid "&Host:"
msgstr ""
@@ -1113,8 +1113,8 @@
msgid "&View"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1128
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:835
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1128
msgid "&View/Edit"
msgstr ""
@@ -1371,8 +1371,8 @@
msgstr ""
#:
../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1063
-#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:119
#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:564
+#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:119
msgid "A&SCII"
msgstr ""
@@ -1753,8 +1753,8 @@
msgstr ""
#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:271
-#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:438
#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:334
+#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:438
msgid "Bookmark"
msgstr ""
@@ -1804,15 +1804,15 @@
msgid "C&lear all"
msgstr ""
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:842
#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1139
#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:918
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:842
msgid "C&opy URL(s) to clipboard"
msgstr ""
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:839
#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1140
#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:919
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:839
msgid "C&opy URL(s) with password to clipboard"
msgstr ""
@@ -1917,11 +1917,11 @@
msgid "Cannot create new filter"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1879
#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1663
#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1712
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1209
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1528
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1879
msgid "Cannot edit file"
msgstr ""
@@ -2314,13 +2314,13 @@
msgid "Confirm deletion"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1841
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1495
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1117
#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1675
#: ../../source/FileZilla3/locales/../src/interface/file_utils.h:47
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1221
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1488
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1841
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1495
+#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1117
msgid "Confirmation needed"
msgstr ""
@@ -2555,9 +2555,9 @@
msgid "Could not convert private key"
msgstr ""
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1419
#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2761
#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1473
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1419
msgid "Could not copy URLs"
msgstr ""
@@ -2719,10 +2719,10 @@
msgid "Could not open '%s'"
msgstr ""
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1419
#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2761
#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1473
#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:220
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1419
msgid "Could not open clipboard"
msgstr ""
@@ -2813,8 +2813,8 @@
msgid "Could not start transfer"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:576
#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:757
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:576
#, c-format
msgid ""
"Could not write \"%s\", any changes to the Site Manager could not be saved: "
@@ -2838,9 +2838,9 @@
"%s"
msgstr ""
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1784
#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:701
#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:758
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1784
#, c-format
msgid "Could not write \"%s\", the selected sites could not be exported: %s"
msgstr ""
@@ -3005,10 +3005,10 @@
msgid "D&efault"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1137
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:916
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:829
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:836
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1137
+#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:916
msgid "D&elete"
msgstr ""
@@ -3177,8 +3177,8 @@
msgid "Details for new key:"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:66
#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:681
+#: ../../source/FileZilla3/locales/../src/interface/import.cpp:66
msgid "Detected newer version of FileZilla"
msgstr ""
@@ -3205,10 +3205,10 @@
#:
../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3025
#:
../../source/FileZilla3/locales/../src/interface/resources/xrc/settings.xrc:1628
#:
../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:534
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2362
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2382
#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:477
#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:51
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2362
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2382
#: ../../source/FileZilla3/locales/../src/interface/view.cpp:109
msgid "Directory comparison"
msgstr ""
@@ -3656,29 +3656,29 @@
msgid "Error loading queue"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/Options.cpp:253
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1582
#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:174
#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:296
#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:748
#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:788
#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:841
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:875
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:966
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:118
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:309
#: ../../source/FileZilla3/locales/../src/interface/osx_sandbox_userdirs.cpp:65
#:
../../source/FileZilla3/locales/../src/interface/osx_sandbox_userdirs.cpp:136
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1350
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1370
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:674
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:737
+#: ../../source/FileZilla3/locales/../src/interface/Options.cpp:253
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1582
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:875
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:966
+#: ../../source/FileZilla3/locales/../src/interface/import.cpp:118
+#: ../../source/FileZilla3/locales/../src/interface/import.cpp:309
#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:37
#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:468
#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:528
#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:637
#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:725
#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:827
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:674
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:737
#: ../../source/FileZilla3/locales/../src/interface/wrapengine.cpp:943
msgid "Error loading xml file"
msgstr ""
@@ -3694,14 +3694,14 @@
msgid "Error starting program"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1602
#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:332
#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:883
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:758
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1785
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1602
#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:577
#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:702
#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:759
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:758
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1785
#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:152
msgid "Error writing xml file"
msgstr ""
@@ -4030,8 +4030,8 @@
#: ../../source/FileZilla3/locales/../src/engine/storj/resolve.cpp:111
#: ../../source/FileZilla3/locales/../src/engine/storj/resolve.cpp:174
#:
../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:124
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:725
#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1638
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:725
msgid "File not found"
msgstr ""
@@ -4112,11 +4112,11 @@
msgstr ""
#:
../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:35
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:283
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:396
#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1146
#:
../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:101
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:159
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:283
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:396
msgid "Filename"
msgstr ""
@@ -4161,10 +4161,10 @@
msgid "Files not found"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:284
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:397
#:
../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:105
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:161
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:284
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:397
msgid "Filesize"
msgstr ""
@@ -4172,9 +4172,9 @@
msgid "Filesize format"
msgstr ""
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:162
#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:285
#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:398
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:162
msgid "Filetype"
msgstr ""
@@ -4788,8 +4788,8 @@
msgid "Invalid port given. The port has to be a value from 1 to 65535."
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:163
#: ../../source/FileZilla3/locales/../src/interface/serverdata.cpp:163
+#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:163
msgid ""
"Invalid protocol specified. Valid protocols are:\n"
"ftp:// for normal FTP with optional encryption,\n"
@@ -4897,9 +4897,9 @@
msgid "Language changed"
msgstr ""
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:163
#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:286
#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:399
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:163
msgid "Last modified"
msgstr ""
@@ -5199,9 +5199,9 @@
msgid "My Documents"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:285
#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:660
#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:663
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:285
msgid "My Sites"
msgstr ""
@@ -5259,8 +5259,8 @@
"family"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:498
#: ../../source/FileZilla3/locales/../src/engine/socket_errors.cpp:52
+#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:498
msgid "Network unreachable"
msgstr ""
@@ -5295,8 +5295,8 @@
#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:579
#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:600
#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:853
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:668
#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1726
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:668
msgid "New bookmark"
msgstr ""
@@ -5319,9 +5319,9 @@
msgid "New folder"
msgstr ""
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1699
#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:548
#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:562
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1699
msgid "New site"
msgstr ""
@@ -5592,12 +5592,12 @@
msgid "Opened as:"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1874
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1887
#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1706
#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1825
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1523
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1536
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1874
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1887
msgid "Opening failed"
msgstr ""
@@ -5712,8 +5712,8 @@
msgid "Owner permissions"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:401
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:165
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:401
msgid "Owner/Group"
msgstr ""
@@ -5747,8 +5747,8 @@
#:
../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:2714
#:
../../source/FileZilla3/locales/../src/interface/resources/xrc/sitemanager.xrc:286
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:50
#: ../../source/FileZilla3/locales/../src/interface/sitemanager_site.cpp:274
+#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:50
msgid "Pass&word:"
msgstr ""
@@ -5821,8 +5821,8 @@
msgid "Permission denied"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:400
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:164
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:400
msgid "Permissions"
msgstr ""
@@ -6122,8 +6122,8 @@
msgid "Preallocation"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:284
#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1427
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:284
msgid "Predefined Sites"
msgstr ""
@@ -6359,8 +6359,8 @@
msgid "Really cancel current operation?"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1487
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1259
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1487
#, c-format
msgid "Really delete %d directory with its contents from the server?"
msgid_plural ""
@@ -6368,16 +6368,16 @@
msgstr[0] ""
msgstr[1] ""
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1484
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1256
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1484
#, c-format
msgid "Really delete %d file from the server?"
msgid_plural "Really delete %d files from the server?"
msgstr[0] ""
msgstr[1] ""
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1492
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1264
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1492
#, c-format
msgid "Really delete %s and %s from the server?"
msgstr ""
@@ -6855,8 +6855,8 @@
msgid "Select file for exported settings"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/export.cpp:36
#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1768
+#: ../../source/FileZilla3/locales/../src/interface/export.cpp:36
msgid "Select file for exported sites"
msgstr ""
@@ -7496,6 +7496,7 @@
msgstr ""
#:
../../source/FileZilla3/locales/../src/interface/resources/xrc/dialogs.xrc:3921
+#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:52
#: ../../source/FileZilla3/locales/../src/interface/state.cpp:269
#: ../../source/FileZilla3/locales/../src/interface/state.cpp:284
#: ../../source/FileZilla3/locales/../src/interface/state.cpp:291
@@ -7508,7 +7509,6 @@
#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1133
#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1142
#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1169
-#: ../../source/FileZilla3/locales/../src/interface/toolbar.cpp:52
msgid "Synchronized browsing"
msgstr ""
@@ -7525,13 +7525,13 @@
msgid "Syntax error"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2510
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2552
#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:83
#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:88
#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:93
#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:100
#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:105
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2510
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2552
msgid "Syntax error in command line"
msgstr ""
@@ -7709,9 +7709,9 @@
"Please enter a new name:"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1878
#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1711
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1527
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1878
#, c-format
msgid ""
"The file '%s' cannot be opened:\n"
@@ -7736,26 +7736,26 @@
msgid "The file '%s' could not be loaded."
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1874
#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1706
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1523
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1874
#, c-format
msgid ""
"The file '%s' could not be opened:\n"
"No program has been associated on your system with this file type."
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1887
#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1825
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1536
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1887
#, c-format
msgid ""
"The file '%s' could not be opened:\n"
"The associated command failed"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:65
#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:680
+#: ../../source/FileZilla3/locales/../src/interface/import.cpp:65
#, c-format
msgid ""
"The file '%s' has been created by a more recent version of FileZilla.\n"
@@ -8663,8 +8663,8 @@
"continue?"
msgstr ""
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1842
#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1489
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1842
msgid ""
"You have selected more than 10 files or directories to open, do you really "
"want to continue?"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/filezilla-3.41.1/src/putty/ssh.c
new/filezilla-3.41.2/src/putty/ssh.c
--- old/filezilla-3.41.1/src/putty/ssh.c 2019-02-22 09:45:01.000000000
+0100
+++ new/filezilla-3.41.2/src/putty/ssh.c 2019-03-18 14:32:00.000000000
+0100
@@ -7442,6 +7442,18 @@
*/
{
int klen = ssh_rsakex_klen(s->rsakey);
+
+ int minlen = (strcmp(ssh->kex->name, "rsa1024-sha1") != 0) ? 2048
: 1024;
+
+ if (klen < minlen) {
+ sfree(s->rsakeydata);
+ bombout(("Server sent %d-bit RSA key, "
+ "less than the minimum size %d for %s "
+ "key exchange", klen, minlen,
+ ssh->kex->name));
+ crStopV;
+ }
+
int nbits = klen - (2*ssh->kex->hash->hlen*8 + 49);
int i, byte = 0;
unsigned char *kstr1, *kstr2, *outstr;
