CVS commit: othersrc/external/bsd/merkletree

["Alistair G. Crooks" <agc%netbsd.org@localhost>]

Module Name:    othersrc
Committed By:   agc
Date:           Tue Feb 15 18:48:32 UTC 2022

Modified Files:
        othersrc/external/bsd/merkletree: Makefile
        othersrc/external/bsd/merkletree/bin: 1.in Makefile
        othersrc/external/bsd/merkletree/dist: Makefile libmerkletree.3 main.c
            merkletree.1 merkletree.h
        othersrc/external/bsd/merkletree/lib: Makefile
Added Files:
        othersrc/external/bsd/merkletree/dist: blake2.c blake2.h blake2b-hl.c
            blake2b.c blake2b.h blake2s-hl.c blake2s.c blake2s.h edstring.c
            edstring.h keccak.c keccak.h libdigest.c libdigest.h merkletree.c
            sha2.c sha2.h sha3.c sha3.h sha3hl.c
        othersrc/external/bsd/merkletree/dist/tests: 1.expected 1.in
            10.expected 11.expected 12.expected 13.expected 14.expected
            15.expected 16.expected 19.expected 2.expected 20.expected
            21.expected 22.expected 3.expected 4.expected 5.expected 6.expected
            7.expected 9.expected
        othersrc/external/bsd/merkletree/dist/tests/dir: 1.expected 1.in
            1.symlink 7.expected
Removed Files:
        othersrc/external/bsd/merkletree/dist: Makefile.in Makefile.lib.in
            Makefile.libtool.in

Log Message:
This is the updated version of the Merkletree code, version 20220204

Digests supported are a bit more up to date:

        blake2b
        blake2s
        sha256
        sha3_256
        sha3_512
        sha512

The default algorithm is sha512, with an input blocksize of 1024.
Input can either be in the form of files, other directory entries, or
from standard input.

Output is in either standard format (similar to digest(1)),

        % merkletree 1.in
        sha512/1024 (1.in) 902387724175187f42a6bce7ab7f1a88a4ce536662880747347dc5ea761fed5a7dac5e98962c60b5c3d7988258c0c9e2a14e37cfeb7972fe9086e693381324c8
        % merkletree < 1.in
        902387724175187f42a6bce7ab7f1a88a4ce536662880747347dc5ea761fed5a7dac5e98962c60b5c3d7988258c0c9e2a14e37cfeb7972fe9086e693381324c8
        %

or can be in JSON format:

        {"name":"1.in","blocksize":1024,"digest":"sha512","1:0":"902387724175187f42a6bce7ab7f1a88a4ce536662880747347dc5ea761fed5a7dac5e98962c60b5c3d7988258c0c9e2a14e37cfeb7972fe9086e693381324c8"}

 (or, run through jq):

        % jq . < dist/tests/11.expected
        {
          "name": "1.in",
          "blocksize": 1024,
          "digest": "sha512",
          "1:0": "902387724175187f42a6bce7ab7f1a88a4ce536662880747347dc5ea761fed5a7dac5e98962c60b5c3d7988258c0c9e2a14e37cfeb7972fe9086e693381324c8"
        }
        %

The input blocksize can be specified by the user, but must be twice
the size of the selected digest's algorithm in raw bytes.

It is possible to run merkletree on a hierarchy by using the "-p path"
argument:

        % merkletree -a sha3_256 -p / bin
        sha3_256/1024 (bin/chgrp) 39e8cc74388ffe34469b1ca91f63d49982662b1c942c9afbd32f48185c3df5ca
        sha3_256/1024 (bin/cat) edc35ffbe3ee8c022bb7914530562a3da46680a5e7f3b37749f04ee04cb87cdb
        sha3_256/1024 (bin/chmod) c58fca83a80c83f645e80365374be1d9191324cd490a78b99e3ab33fedebacb5
        sha3_256/1024 (bin/chio) d8a00ff730bc8a4a108d170ab6f2d690e7f6c201b164b23f256f6013ee08ffef
        sha3_256/1024 (bin/domainname) b04a2dafa1a9b14257f63e49acac8c91150c09649519daa3fc0e2f6add79644e
        sha3_256/1024 (bin/cp) 7c97f28d4257e6743e315b46d8119baa3718adf6b1b25e4221016dd90db266c6
        sha3_256/1024 (bin/cpio) 7e2371ff80c900f31783e147ded8a5a2b87cebdff6eda3638d52611aefe63243
        sha3_256/1024 (bin/csh) 16e4e9acd76b3ca6de71a796c77a0593e365048037d0e433cba96d5a8d2b27d4
        sha3_256/1024 (bin/date) 05891939e39d7180e8bf252b8b8fc087b309a46e4845b4980bbc3fea1f5307ae
        sha3_256/1024 (bin/dd) 67b28e1d3399a2edef52b39683a0d8b56f812fa37b56aeda92a427b0db50dfb8
        sha3_256/1024 (bin/df) a360c756b2d64003247140924b8223b1dbe161f9b70ce96a915c85d9bab23e51
        sha3_256/1024 (bin/hostname) ddba878bc063a3123cdb4cf8d272a0438ab2f6a4141618e70726fda45f41b1cb
        sha3_256/1024 (bin/echo) cd3c415f168bb4a8df2e2f12b1238137b7004453affa5497741175761e516cc0
        sha3_256/1024 (bin/ed) 7a915104df73a5682d091fb0214af110e4c1c6bec306d9ccf2ffd527c09c856e
        sha3_256/1024 (bin/expr) aaf51c742e02ca40abc402a6fdd283488c11d3e549039d0d62e7c29795987185
        sha3_256/1024 (bin/mkdir) e425ae2f2c7771d4e4bfae0f335c44016548a37eb1915b5ed665ba4e4feeb1b6
        sha3_256/1024 (bin/kill) 999a17e8c03e022180fe842e92273f7656719027618bb9de90b46ada48ab518f
        sha3_256/1024 (bin/ksh) a862c37708a7417a4e35ed04363ef3d83c141efc5659eb04c141063fe0ec7ba2
        sha3_256/1024 (bin/ln) a0e93d49eba74b0b48a712fa143faaf9735cf7a82343e992cb12b3cc8fa485c2
        sha3_256/1024 (bin/ls) 006d65534a13845efa9af7c252174e54a75c142a1db4dfd86c78f95c7f5297b6
        sha3_256/1024 (bin/pax) 0fb2c7557feb33ea9073b36db01a44ef4b2609386a4fb771db21ad44fd48064f
        sha3_256/1024 (bin/sleep) d548731fc8b401d2070ab4eeeeab84c012d69c96a0a71dd8b7f882862b481ff0
        sha3_256/1024 (bin/mt) 8223efa972949ebe508ca066bc9e9b7ee0c8f3dbec42b68919134bf2c38cdf2e
        sha3_256/1024 (bin/mv) 65c5830326958f85165d49e673935df4305dff3802c86010e8c7efbccb084a33
        sha3_256/1024 (bin/rmdir) 5b785cfb9594247f5772b15e6946e7546929679c170b40fcd0275a68ffa95eac
        sha3_256/1024 (bin/ps) 8d5e766181cfa5d2174bd558994b773eddfdd126474b06bf9f4e1a87fc93dde0
        sha3_256/1024 (bin/pwd) 5fd7c3c5e9af7135248afa1e01a3a431536ffc9363c26d74cd2ba95e44bb13dc
        sha3_256/1024 (bin/rcmd) a6fde1189f80f354f024621954ec2630589384268182f458737a7d0820193d7d
        sha3_256/1024 (bin/rcp) 9863785c1f95449150dddf634c4d0485b12fcd33f3fff85a268805b13665fc09
        sha3_256/1024 (bin/rm) ba9f8bf91fb070db7aaccccbe21a79263810a6e7ce65dff93932fce569effb57
        sha3_256/1024 (bin/tar) 5441da55b4db7ee6b5acd603edad069a1fa8a61643b1b6e6b4c14eb75e4239ec
        sha3_256/1024 (bin/rump.dd) a15b1a5aa3b6b59568e2cae5cbfb2979abf0d73734f0b049fa1e13426b2cf035
        sha3_256/1024 (bin/sh) 29b86c7f8fa34ac6d8a4e04e4b9280ca986f1e99906743eea2c4fe96b9cd16fc
        sha3_256/1024 (bin/stty) 4b33e1afb82cabf8c93fe96bb419b6449d25ed28dc4e9a8afb94736f6922e087
        sha3_256/1024 (bin/sync) 5b454179f10e47af9a49d6d4b473c1c833878f50dba49bb664a5b36a8e12ee36
        sha3_256/1024 (bin/tcsh) 9ec17e221e01fea34b67e1c8db27dcd6360f749fa1ab64d1d4405e966cd7c6b2
        sha3_256/1024 (bin/test) e04425b059ff599cc672d9e0dc81e887630c6243ae0e13461a5158fea4740a64
        sha3_256/1024 (bin/[) e04425b059ff599cc672d9e0dc81e887630c6243ae0e13461a5158fea4740a64
        sha3_256/1024 (bin/getfacl) 5bb9a9e1ffed1624dd9a2560e2378ac6c5ac3b071ff263b87a67160764244934
        sha3_256/1024 (bin/setfacl) 1b098acf1fa48cada519a1f1e84fd87566462ae939a7976db88bdfed179287b8
        %


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/merkletree/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/merkletree/bin/1.in \
    othersrc/external/bsd/merkletree/bin/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/merkletree/dist/Makefile \
    othersrc/external/bsd/merkletree/dist/libmerkletree.3 \
    othersrc/external/bsd/merkletree/dist/main.c \
    othersrc/external/bsd/merkletree/dist/merkletree.1 \
    othersrc/external/bsd/merkletree/dist/merkletree.h
cvs rdiff -u -r1.2 -r0 othersrc/external/bsd/merkletree/dist/Makefile.in
cvs rdiff -u -r1.1 -r0 othersrc/external/bsd/merkletree/dist/Makefile.lib.in \
    othersrc/external/bsd/merkletree/dist/Makefile.libtool.in
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/merkletree/dist/blake2.c \
    othersrc/external/bsd/merkletree/dist/blake2.h \
    othersrc/external/bsd/merkletree/dist/blake2b-hl.c \
    othersrc/external/bsd/merkletree/dist/blake2b.c \
    othersrc/external/bsd/merkletree/dist/blake2b.h \
    othersrc/external/bsd/merkletree/dist/blake2s-hl.c \
    othersrc/external/bsd/merkletree/dist/blake2s.c \
    othersrc/external/bsd/merkletree/dist/blake2s.h \
    othersrc/external/bsd/merkletree/dist/edstring.c \
    othersrc/external/bsd/merkletree/dist/edstring.h \
    othersrc/external/bsd/merkletree/dist/keccak.c \
    othersrc/external/bsd/merkletree/dist/keccak.h \
    othersrc/external/bsd/merkletree/dist/libdigest.c \
    othersrc/external/bsd/merkletree/dist/libdigest.h \
    othersrc/external/bsd/merkletree/dist/merkletree.c \
    othersrc/external/bsd/merkletree/dist/sha2.c \
    othersrc/external/bsd/merkletree/dist/sha2.h \
    othersrc/external/bsd/merkletree/dist/sha3.c \
    othersrc/external/bsd/merkletree/dist/sha3.h \
    othersrc/external/bsd/merkletree/dist/sha3hl.c
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/merkletree/dist/tests/1.expected \
    othersrc/external/bsd/merkletree/dist/tests/1.in \
    othersrc/external/bsd/merkletree/dist/tests/10.expected \
    othersrc/external/bsd/merkletree/dist/tests/11.expected \
    othersrc/external/bsd/merkletree/dist/tests/12.expected \
    othersrc/external/bsd/merkletree/dist/tests/13.expected \
    othersrc/external/bsd/merkletree/dist/tests/14.expected \
    othersrc/external/bsd/merkletree/dist/tests/15.expected \
    othersrc/external/bsd/merkletree/dist/tests/16.expected \
    othersrc/external/bsd/merkletree/dist/tests/19.expected \
    othersrc/external/bsd/merkletree/dist/tests/2.expected \
    othersrc/external/bsd/merkletree/dist/tests/20.expected \
    othersrc/external/bsd/merkletree/dist/tests/21.expected \
    othersrc/external/bsd/merkletree/dist/tests/22.expected \
    othersrc/external/bsd/merkletree/dist/tests/3.expected \
    othersrc/external/bsd/merkletree/dist/tests/4.expected \
    othersrc/external/bsd/merkletree/dist/tests/5.expected \
    othersrc/external/bsd/merkletree/dist/tests/6.expected \
    othersrc/external/bsd/merkletree/dist/tests/7.expected \
    othersrc/external/bsd/merkletree/dist/tests/9.expected
cvs rdiff -u -r0 -r1.1 \
    othersrc/external/bsd/merkletree/dist/tests/dir/1.expected \
    othersrc/external/bsd/merkletree/dist/tests/dir/1.in \
    othersrc/external/bsd/merkletree/dist/tests/dir/1.symlink \
    othersrc/external/bsd/merkletree/dist/tests/dir/7.expected
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/merkletree/lib/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.