simon-git: putty (master): Simon Tatham

[Commits to Tartarus CVS repository.]

TL;DR:
  2d217ec Ahem. Cross-certify the key the user actually asked for.
  221d669 Update the specials menu as keys are cross-certified.
  d3dd9a4 MSI-related updates to .gitignore.

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:           2016-03-21 19:43:42

commit 2d217ec862529029d1d146b7f92a4ac8deee85d9
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=2d217ec862529029d1d146b7f92a4ac8deee85d9;hp=e786452cb2dbd190e3b72e68b08a261454151cbe
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Mar 21 18:59:01 2016 +0000

    Ahem. Cross-certify the key the user actually asked for.
    
    I got momentarily confused between whether the special code
    (TS_LOCALSTART+i) meant the ith entry in the variable
    uncert_hostkeys[] array, or the ith entry in the fixed hostkey_algs[]
    array. Now I think everything agrees on it being the latter.

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

commit 221d669e4dd0d1fbde6b8929b4e50bd5f89de086
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=221d669e4dd0d1fbde6b8929b4e50bd5f89de086;hp=2d217ec862529029d1d146b7f92a4ac8deee85d9
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Mar 21 19:05:32 2016 +0000

    Update the specials menu as keys are cross-certified.
    
    If you've just certified a key, you want it to vanish from the menu
    immediately, of course.

 ssh.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit d3dd9a4dbacafd6e2992706b65993c6020abcf2d
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=d3dd9a4dbacafd6e2992706b65993c6020abcf2d;hp=221d669e4dd0d1fbde6b8929b4e50bd5f89de086
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Mar 21 19:07:40 2016 +0000

    MSI-related updates to .gitignore.

 .gitignore |    3 +++
 1 file changed, 3 insertions(+)