simon-git: putty (master): Simon Tatham

[Commits to Tartarus CVS repository.]

TL;DR:
  705f159 Allow a cipher to override the SSH KEX's choice of MAC.
  5d9a9a7 Allow a cipher to specify encryption of the packet length.
  b0823fc Add the ChaCha20-Poly1305 cipher+MAC, as implemented by OpenSSH.
  d0c74a1 Make log messages look slightly nicer.
  2c60070 Move BignumInt definitions into a header file.
  8581676 Dedicated routines for poly1305 arithmetic.

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-06-07 13:51:36

commit 705f1592552aa39bc1a5061ee48f1f5a0f0d1cbb
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=705f1592552aa39bc1a5061ee48f1f5a0f0d1cbb;hp=3ce4594d141d1ffa7f4db9fa441e0b03ef496c82
Author: Chris Staite <chris at yourdreamnet.co.uk>
Date:   Sun Jun 7 13:40:11 2015 +0100

    Allow a cipher to override the SSH KEX's choice of MAC.
    
    No cipher uses this facility yet, but one shortly will.

 cproxy.c   |    2 +-
 ssh.c      |   15 +++++++++++++--
 ssh.h      |    8 ++++++--
 sshaes.c   |   21 ++++++++++++++-------
 ssharcf.c  |    6 ++++--
 sshblowf.c |    6 ++++--
 sshdes.c   |   12 ++++++++----
 sshmd5.c   |    2 +-
 sshsh256.c |    2 +-
 sshsha.c   |    2 +-
 10 files changed, 53 insertions(+), 23 deletions(-)

commit 5d9a9a7bdf6f227a2a592d57ea71b69d0111e341
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=5d9a9a7bdf6f227a2a592d57ea71b69d0111e341;hp=705f1592552aa39bc1a5061ee48f1f5a0f0d1cbb
Author: Chris Staite <chris at yourdreamnet.co.uk>
Date:   Sun Jun 7 12:51:24 2015 +0100

    Allow a cipher to specify encryption of the packet length.
    
    No cipher uses this facility yet, but one shortly will.

 ssh.c      |   20 ++++++++++++++++++--
 ssh.h      |    4 ++++
 sshaes.c   |   14 +++++++-------
 ssharcf.c  |    4 ++--
 sshblowf.c |    4 ++--
 sshdes.c   |    8 ++++----
 6 files changed, 37 insertions(+), 17 deletions(-)

commit b0823fc5be15e429bac4619bf7e2e9f829c02eea
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=b0823fc5be15e429bac4619bf7e2e9f829c02eea;hp=5d9a9a7bdf6f227a2a592d57ea71b69d0111e341
Author: Chris Staite <chris at yourdreamnet.co.uk>
Date:   Sun Jun 7 12:51:51 2015 +0100

    Add the ChaCha20-Poly1305 cipher+MAC, as implemented by OpenSSH.

 Recipe     |    2 +-
 config.c   |    1 +
 putty.h    |    1 +
 settings.c |    1 +
 ssh.c      |    3 +
 ssh.h      |    1 +
 sshccp.c   |  542 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 550 insertions(+), 1 deletion(-)

commit d0c74a115a80c0dfdd4f2ecb057f24afbdbaae97
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=d0c74a115a80c0dfdd4f2ecb057f24afbdbaae97;hp=b0823fc5be15e429bac4619bf7e2e9f829c02eea
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Jun 7 12:46:33 2015 +0100

    Make log messages look slightly nicer.
    
    I'd rather see the cipher and MAC named separately, with a hint that
    the two are linked together in some way, than see the cipher called by
    a name including the MAC and the MAC init message have an ugly
    '<implicit>' in it.

 ssh.c    |   10 ++++++----
 sshccp.c |    4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

commit 2c60070aad2d959a9e7e850523352c23c6aa7009
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=2c60070aad2d959a9e7e850523352c23c6aa7009;hp=d0c74a115a80c0dfdd4f2ecb057f24afbdbaae97
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Jun 6 14:52:29 2015 +0100

    Move BignumInt definitions into a header file.
    
    This allows files other than sshbn.c to work with the primitives
    necessary to build multi-word arithmetic functions satisfying all of
    PuTTY's portability constraints.

 sshbn.c |   85 +---------------------------------------------------------
 sshbn.h |   92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 84 deletions(-)

commit 8581676ee9c4ebd6365444d3d98973bf8fe33ccb
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=8581676ee9c4ebd6365444d3d98973bf8fe33ccb;hp=2c60070aad2d959a9e7e850523352c23c6aa7009
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Jun 7 12:26:26 2015 +0100

    Dedicated routines for poly1305 arithmetic.
    
    Rather than doing arithmetic mod 2^130-5 using the general-purpose
    Bignum library, which requires lots of mallocs and frees per operation
    and also uses a general-purpose divide routine for each modular
    reduction, we now have some dedicated routines in sshccp.c to do
    arithmetic mod 2^130-5 in a more efficient way, and hopefully also
    with data-independent performance.
    
    Because PuTTY's target platforms don't all use the same size of bignum
    component, I've arranged to auto-generate the arithmetic functions
    using a Python script living in the 'contrib' directory. As and when
    we need to support an extra BignumInt size, that script should still
    be around to re-run with different arguments.

 contrib/make1305.py |  267 +++++++++++++++++
 sshccp.c            |  804 +++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 1011 insertions(+), 60 deletions(-)