simon-git: putty (master): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  7ae5c354 New utility function: ptrlen_get_word().
  6cae94be cgtest: add a 'verbose' flag.
  692238cc cgtest: call random_ref() before saving private keys.
  d159a6ef cgtest: destroy the global PRNG after every cmdgen_main().
  8c710ddd cgtest: update OpenSSH fingerprinting mechanism.

Repository:     https://git.tartarus.org/simon/putty.git
On the web:     https://git.tartarus.org/?p=simon/putty.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2019-03-24 14:15:40

commit 7ae5c354191a0821b64d856e2d2ed73e24e8a92b
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=7ae5c354191a0821b64d856e2d2ed73e24e8a92b;hp=190761a272a1d1e25ed1445dbb41a6f56a213883
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Mar 24 14:03:51 2019 +0000

    New utility function: ptrlen_get_word().
    
    This is similar to strtok, only it operates on a ptrlen. Therefore it
    can be properly stateless, or rather, it stores its state by
    overwriting the input ptrlen to point to a tail of its previous value.
    
    Also in this commit I add a clarifying comment about when
    ptrlen_{starts,ends}with will write through its 'tail' pointer.

 misc.h  |  6 ++++++
 utils.c | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+)

commit 6cae94be7e7f3e7078a80c88b1820a712a5c501d
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=6cae94be7e7f3e7078a80c88b1820a712a5c501d;hp=7ae5c354191a0821b64d856e2d2ed73e24e8a92b
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Mar 24 13:48:38 2019 +0000

    cgtest: add a 'verbose' flag.
    
    Activated by setting CGTEST_VERBOSE in the environment, since we
    already use the whole cgtest command line for other purposes.

 cmdgen.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

commit 692238cc5f19507c63e61b269960581b0c6157bf
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=692238cc5f19507c63e61b269960581b0c6157bf;hp=6cae94be7e7f3e7078a80c88b1820a712a5c501d
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Mar 24 14:05:35 2019 +0000

    cgtest: call random_ref() before saving private keys.
    
    The save functions do need some random data (for padding encrypted
    blocks), so we must ensure a PRNG is available to generate that data.

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

commit d159a6efac61814d9bde27a1ca34f3e0dbe1b823
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=d159a6efac61814d9bde27a1ca34f3e0dbe1b823;hp=692238cc5f19507c63e61b269960581b0c6157bf
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Mar 24 14:08:11 2019 +0000

    cgtest: destroy the global PRNG after every cmdgen_main().
    
    This prevents an assertion failure when random_ref() tries to create
    a new PRNG instance and finds there already is one. It also exposes
    bugs in which some code path forgot to initialise the PRNG when it
    was going to need it, such as the one fixed in the previous commit.

 cmdgen.c  |  1 +
 putty.h   |  7 +++++++
 sshrand.c | 14 ++++++++++----
 3 files changed, 18 insertions(+), 4 deletions(-)

commit 8c710dddc585022ad6503d0bfb3eb7291b6ef05c
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=8c710dddc585022ad6503d0bfb3eb7291b6ef05c;hp=d159a6efac61814d9bde27a1ca34f3e0dbe1b823
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Mar 24 14:06:17 2019 +0000

    cgtest: update OpenSSH fingerprinting mechanism.
    
    We can only get fingerprints compatible with our own system by passing
    the '-E md5' option to ssh-keygen. Also, we must strip the "MD5:"
    prefix from the hash component of the returned fingerprint.
    
    Since that hash appears in the middle of the string we were previously
    extracting, I've reworked the whole cleanup_fp function to use the new
    ptrlen_get_word, which makes it easy to extract two words from the
    string and then strip a prefix off the second one.

 cmdgen.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)