simon-git: putty (main): Simon Tatham

Commits to Tartarus hosted VCS tartarus-commits at lists.tartarus.org
Sun Feb 21 17:19:10 GMT 2021


TL;DR:
  8eb4cd56 Fix determinism failures in cgtest.

Repository:     https://git.tartarus.org/simon/putty.git
On the web:     https://git.tartarus.org/?p=simon/putty.git
Branch updated: main
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2021-02-21 17:19:10

commit 8eb4cd5674e3d7ebf38696696740792bdc07aee1
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=8eb4cd5674e3d7ebf38696696740792bdc07aee1;hp=342972ee602fd7732d6449187aba8d956b26c147
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Feb 21 14:37:59 2021 +0000

    Fix determinism failures in cgtest.
    
    Thanks to Pavel and his CI for pointing out what I'd forgotten: the
    automated test of cmdgen.c expects that round-tripping a PPK file to
    some other format and back will regenerate the identical file. Of
    course, with a randomised salt in the new-look password hash, that
    isn't true any more in normal usage.
    
    Fixed by adding an option in the existing parameters structure to
    provide a salt override. That shouldn't be used anywhere except
    cgtest, but in cgtest, it restores the determinism we need.
    
    Another potential (but not guaranteed) source of difference is the
    automatic time-scaling of the Argon2 parameter choice. So I've turned
    that off too, while I'm at it.

 cgtest.c    | 17 +++++++++++++++++
 ssh.h       |  8 ++++++++
 sshpubk.c   |  5 ++++-
 testcrypt.c |  1 +
 4 files changed, 30 insertions(+), 1 deletion(-)



More information about the tartarus-commits mailing list