simon-git: putty (master): Simon Tatham

Sat Aug 15 13:58:51 BST 2015

TL;DR:
  ce9b13d Fix warning about missing return in ssh2_kexinit_addalg
  5f37d92 Remove unused variable.
  05c7678 Fix warning about uninitialized variable.
  481ebd2 Remove an unused variable.
  98f20be Remove an unused variable.
  3377ea5 Fix  __uint128_t compile error on MinGW.
  fe21069 Detect end of string in fingerprint alignment.
  c058fc4 Make manifest files work with 64bit builds of PuTTY.
  1f6504c Do not re-define SECURITY_WIN32 if already defined.
  6539d39 Use correct type to print Windows error codes.
  9965cd8 Fix warning about mismatched constness.
  f2e6127 Cast pointers to uintptr_t instead of unsigned {long,int}.
  71bc6a3 Fix type of 4th argument to WinHelp
  a399043 Fix type of third argument to AppendMenu
  1ce3911 DLGPROC callbacks should return INT_PTR.
  3ca54e4 Use INT_PTR not int to store result of DialogBoxParam.
  44c107d Cast return value of ShellExecute to INT_PTR.
  636f9cf Use DWORD as length argument for RegQueryValueEx.
  a6bd42c Fix signature of platform_new_connection.
  f3f2154 Close file descriptor in test main().

Repository:     git://git.tartarus.org/simon/putty.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=putty.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2015-08-15 13:58:50

commit ce9b13db53eedba8d32ce1622a7ec773467c522d
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=ce9b13db53eedba8d32ce1622a7ec773467c522d;hp=e443fd3a77f8c138b458fb8759dc0747703541ac
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 09:39:05 2015 +0200

    Fix warning about missing return in ssh2_kexinit_addalg

 ssh.c |    1 +
 1 file changed, 1 insertion(+)

commit 5f37d92450825600abf4a39ece396ddf4932af63
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=5f37d92450825600abf4a39ece396ddf4932af63;hp=ce9b13db53eedba8d32ce1622a7ec773467c522d
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 13:44:28 2015 +0200

    Remove unused variable.

 windows/winpgnt.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 05c7678fdb44a76eb7237b4f1a8cb206a26b22ca
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=05c7678fdb44a76eb7237b4f1a8cb206a26b22ca;hp=5f37d92450825600abf4a39ece396ddf4932af63
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 10:44:00 2015 +0200

    Fix warning about uninitialized variable.

    Some MinGW versions do not know that assert(0) never returns. This
    change also handles the case of building with NDEBUG.

 import.c |    2 ++
 1 file changed, 2 insertions(+)

commit 481ebd232e07a644b4ef5d6f1d13edc58a194971
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=481ebd232e07a644b4ef5d6f1d13edc58a194971;hp=05c7678fdb44a76eb7237b4f1a8cb206a26b22ca
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 14:05:59 2015 +0200

    Remove an unused variable.

 windows/winctrls.c |    1 -
 1 file changed, 1 deletion(-)

commit 98f20bef7705879abc2510018c6e826d4147def9
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=98f20bef7705879abc2510018c6e826d4147def9;hp=481ebd232e07a644b4ef5d6f1d13edc58a194971
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 14:29:44 2015 +0200

    Remove an unused variable.

 windows/winpgnt.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit 3377ea57f5d333d65d44a1130161396782389e88
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=3377ea57f5d333d65d44a1130161396782389e88;hp=98f20bef7705879abc2510018c6e826d4147def9
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 09:43:34 2015 +0200

    Fix  __uint128_t compile error on MinGW.

    MinGW has __uint128_t, but not __uint64_t.

 sshbn.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fe210692fd0699e91d0194b44dc5faf278d90093
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=fe210692fd0699e91d0194b44dc5faf278d90093;hp=3377ea57f5d333d65d44a1130161396782389e88
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 13:45:26 2015 +0200

    Detect end of string in fingerprint alignment.

    This prevents writing past the end of the buffer should
    ssh2_fingerprint ever return a fingerprint not containing a colon.

 windows/winpgnt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c058fc4ea2ef5ef6d6732b9e8fd65cd723088ab7
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=c058fc4ea2ef5ef6d6732b9e8fd65cd723088ab7;hp=fe210692fd0699e91d0194b44dc5faf278d90093
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 11:10:33 2015 +0200

    Make manifest files work with 64bit builds of PuTTY.

    Otherwise we would get 0xc000007b error when trying to start a 64bit
    PuTTY Windows binary.

 windows/pageant.mft  |    4 ++--
 windows/putty.mft    |    4 ++--
 windows/puttygen.mft |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

commit 1f6504c2de427b0db6267fe7e93ace626970c287
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=1f6504c2de427b0db6267fe7e93ace626970c287;hp=c058fc4ea2ef5ef6d6732b9e8fd65cd723088ab7
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 11:25:40 2015 +0200

    Do not re-define SECURITY_WIN32 if already defined.

    Some toolchains have SECURITY_WIN32 defined by default.

 windows/winmisc.c |    2 ++
 1 file changed, 2 insertions(+)

commit 6539d39755e82e3a39f61aa0ff4e415b4861320b
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=6539d39755e82e3a39f61aa0ff4e415b4861320b;hp=1f6504c2de427b0db6267fe7e93ace626970c287
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 14:13:20 2015 +0200

    Use correct type to print Windows error codes.

    GetLastError returns DWORD. To print it, convert it to unsigned int
    and use the %u format specifier.

 windows/winmisc.c |    4 ++--
 windows/winnet.c  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 9965cd8a53b88715bcfbd942ed90c4581a4c53d8
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=9965cd8a53b88715bcfbd942ed90c4581a4c53d8;hp=6539d39755e82e3a39f61aa0ff4e415b4861320b
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 14:18:13 2015 +0200

    Fix warning about mismatched constness.

 windows/winnet.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f2e61275f229b5eefb7a4375b3025a0b5554089a
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=f2e61275f229b5eefb7a4375b3025a0b5554089a;hp=9965cd8a53b88715bcfbd942ed90c4581a4c53d8
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 14:01:02 2015 +0200

    Cast pointers to uintptr_t instead of unsigned {long,int}.

    On 64bit Windows, pointers are 64bit whereas both unsigned long and
    unsigned int are 32bit. Using uintptr_t avoids truncation.

 misc.c             |    2 +-
 windows/winhandl.c |    8 ++++----
 windows/winnet.c   |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

commit 71bc6a3459a1f678ef213b09ae39122a0c6baafd
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=71bc6a3459a1f678ef213b09ae39122a0c6baafd;hp=f2e61275f229b5eefb7a4375b3025a0b5554089a
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 14:07:36 2015 +0200

    Fix type of 4th argument to WinHelp

    We're passing a pointer as 4th argument to WinHelp. Do not cast it to
    DWORD which would truncate the pointer. Instead use UINT_PTR as that
    is what WinHelp expects.

 windows/winhelp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a39904388fa5789749f1687692bfa9b96a7e29f2
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=a39904388fa5789749f1687692bfa9b96a7e29f2;hp=71bc6a3459a1f678ef213b09ae39122a0c6baafd
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 14:25:42 2015 +0200

    Fix type of third argument to AppendMenu

    We are passing pointers as third argument to AppendMenu. Do not
    truncate them to UINT, use UINT_PTR instead which has the required
    size on 64bit Windows.

 windows/winpgen.c |    8 ++++----
 windows/winpgnt.c |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

commit 1ce39113f54c7887c75ef1915eaf486b88111199
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=1ce39113f54c7887c75ef1915eaf486b88111199;hp=a39904388fa5789749f1687692bfa9b96a7e29f2
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 14:22:09 2015 +0200

    DLGPROC callbacks should return INT_PTR.

    The Windows headers define the return type of DLGPROC as INT_PTR which
    on 64bit Windows has a different size than int.

 windows/winpgen.c |    8 ++++----
 windows/winpgnt.c |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

commit 3ca54e45e32e73c0c6e4530cf95218f45a07c9d3
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=3ca54e45e32e73c0c6e4530cf95218f45a07c9d3;hp=1ce39113f54c7887c75ef1915eaf486b88111199
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 14:27:48 2015 +0200

    Use INT_PTR not int to store result of DialogBoxParam.

 windows/winpgnt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 44c107d56aa0e408fd4dd710134151f09149e526
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=44c107d56aa0e408fd4dd710134151f09149e526;hp=3ca54e45e32e73c0c6e4530cf95218f45a07c9d3
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 14:30:14 2015 +0200

    Cast return value of ShellExecute to INT_PTR.

    ShellExecute returns HINSTANCE which is a typedef for void*. Cast the
    return value to INT_PTR instead of int to avoid truncation on 64bit
    builds.

 windows/winpgnt.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 636f9cf2ee8423fc10580e62804530997f6ee689
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=636f9cf2ee8423fc10580e62804530997f6ee689;hp=44c107d56aa0e408fd4dd710134151f09149e526
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 14:34:11 2015 +0200

    Use DWORD as length argument for RegQueryValueEx.

 windows/winstore.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a6bd42ca248c1c4c12616a729cc703a1199d7833
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=a6bd42ca248c1c4c12616a729cc703a1199d7833;hp=636f9cf2ee8423fc10580e62804530997f6ee689
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 11:27:20 2015 +0200

    Fix signature of platform_new_connection.

    The hostname is a const char *.

 pproxy.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f3f215423bca59a0f09483db973d5ddc44d3d041
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=f3f215423bca59a0f09483db973d5ddc44d3d041;hp=a6bd42ca248c1c4c12616a729cc703a1199d7833
Author: Tim Kosse <tim.kosse at filezilla-project.org>
Date:   Tue Aug 11 11:30:13 2015 +0200

    Close file descriptor in test main().

    Some static analyzers are complaining about it.

 sshzlib.c |    1 +
 1 file changed, 1 insertion(+)