{"header":{"message":"change: add base32 decode, initial deconstruction of hashed","description":null,"timestamp":"2022-08-25T15:36:02.340696095Z","authors":[{}]},"hash":"VKLGQREYOZDV46F672RFE5XJO3OEOP4EHTCWZYOJY24HVPQX3L6QC","authors":[{"login":"laumann","key":"AFgzZkD8ARgC21gkkCvxPV5HbL7YDVzgYEhbAxQG7UQY"}],"deps":{"hashes":[["VKLGQREYOZDV46F672RFE5XJO3OEOP4EHTCWZYOJY24HVPQX3L6QC","change: add base32 decode, initial deconstruction of hashed"],["AA",null],["X36ICMJNYKJF35ZUEVCCR33JOZPCPZQ6KSGEQI3RZND2P5EDASLQC","Initial import for blake3"],["OBKF6SIIFFHHY7YWKPPX75N23NAVUD5662DKIHXSSIDPKKXQ5ZDQC","change: decompress the hashed section too"],["Q7TKZCJP2Z75EICZYKCEZDHKGERSOKZGMTSU3UXETBHTF663T66AC","Add initial support for reading the offsets from a (fixed) change"],["RIWSVVASWLJQQTSVRHIIUPENOZWOMHQLZMTQVGJUS2ZUGDPSWWIQC","change: decompress the 'contents' with zstd_seekable"],["QEFCNNVCEDFUV7O4ASWVI4QUTUFWLHAOTJMDCZ3DFJIUQWTAN3SAC","change: display offsets for given change file"],["PEUS54XQ5KJQYAVUYBG5MWLEHIOVPMZ3ANVC7HPQP6JUWWPRDW5AC",""],["B3XLVPNC4COLLC3FUE34Y7HIKTMF6CJZUASZOU3YM2YGPZKJZP7QC","Add ani.c and initial Makefile"]],"deps":["X36ICMJNYKJF35ZUEVCCR33JOZPCPZQ6KSGEQI3RZND2P5EDASLQC","OBKF6SIIFFHHY7YWKPPX75N23NAVUD5662DKIHXSSIDPKKXQ5ZDQC"],"known":["Q7TKZCJP2Z75EICZYKCEZDHKGERSOKZGMTSU3UXETBHTF663T66AC","RIWSVVASWLJQQTSVRHIIUPENOZWOMHQLZMTQVGJUS2ZUGDPSWWIQC"]},"hunks":[{"Edit":{"inode":{"change":4,"pos":80},"path":"change.h","line":35,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":810}],"down_context":[{"change":4,"pos":810}],"flag":"BLOCK","start":0,"end":213,"inode":{"change":4,"pos":80}}},"contents":[{"Add":"struct change_header {"},{"Add":"\tchar *message;\t\t/* the \"commit\" message */"},{"Add":"\tchar *description;\t/* the other undescribed part of a change */"},{"Add":"\tchar *timestamp;\t/* yes, as a string */"},{"Add":"\tvoid *authors;\t\t/* something... */"},{"Add":"};"},{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":80},"path":"change.h","line":43,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":814}],"down_context":[{"change":4,"pos":814}],"flag":"BLOCK","start":214,"end":669,"inode":{"change":4,"pos":80}}},"contents":[{"Add":" * The parts of a given change that is blake3-hashed."},{"Add":" *"},{"Add":" * The actual hashing happens on the serialized (w/bincode) version of this"},{"Add":" * struct. Decoding the 'changes' field will take quite a bit of doing, it's a"},{"Add":" * fairly convoluted field."},{"Add":" */"},{"Add":"struct hashed {"},{"Add":"\tuint64_t version;\t/* same as in offsets? here to be hashed! */"},{"Add":"\tstruct change_header header;"},{"Add":"\tvoid *dependencies;\t/* array of hashes */"},{"Add":"\tvoid *extra_known;\t/* another array of hashes */"},{"Add":"};"},{"Add":""},{"Add":"/**"}]}},{"Edit":{"inode":{"change":4,"pos":1047},"path":"change.c","line":11,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":66}],"down_context":[{"change":4,"pos":1192}],"flag":"BLOCK","start":670,"end":690,"inode":{"change":4,"pos":1047}}},"contents":[{"Add":"#include \"blake3.h\""}]}},{"Edit":{"inode":{"change":4,"pos":1047},"path":"change.c","line":13,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":1212}],"down_context":[{"change":3,"pos":0}],"flag":"BLOCK","start":691,"end":711,"inode":{"change":4,"pos":1047}}},"contents":[{"Add":"#include \"base32.h\""}]}},{"Replacement":{"inode":{"change":4,"pos":1047},"path":"change.c","line":25,"ins":{"up_context":[{"change":3,"pos":130}],"down_context":[{"change":3,"pos":167}],"flag":"BLOCK","start":712,"end":747,"inode":{"change":4,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":130},"to":{"change":3,"start":130,"end":167},"introduced_by":3}],"inode":{"change":4,"pos":1047}},"ins_contents":[{"Add":"\tprintf(\"%s = [%u\", name, buf[0]);"}],"del_contents":[{"Del":"\tprintf(\"%s = [%02x\", name, buf[0]);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":1047},"path":"change.c","line":27,"ins":{"up_context":[{"change":3,"pos":194}],"down_context":[{"change":3,"pos":222}],"flag":"BLOCK","start":748,"end":774,"inode":{"change":4,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":194},"to":{"change":3,"start":194,"end":222},"introduced_by":3}],"inode":{"change":4,"pos":1047}},"ins_contents":[{"Add":"\t\tprintf(\", %u\", buf[i]);"}],"del_contents":[{"Del":"\t\tprintf(\", %02x\", buf[i]);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":1047},"path":"change.c","line":144,"ins":{"up_context":[{"change":3,"pos":1083}],"down_context":[{"change":3,"pos":1155}],"flag":"BLOCK","start":775,"end":871,"inode":{"change":4,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1083},"to":{"change":3,"start":1083,"end":1155},"introduced_by":3}],"inode":{"change":4,"pos":1047}},"ins_contents":[{"Add":"change_decode_hashed(int fd, size_t comp_hashed_len, size_t hashed_len, uint8_t *expected_hash)"}],"del_contents":[{"Del":"change_decode_hashed(int fd, size_t comp_hashed_len, size_t hashed_len)\n"}]}},{"Edit":{"inode":{"change":4,"pos":1047},"path":"change.c","line":147,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1172}],"down_context":[{"change":4,"pos":2591}],"flag":"BLOCK","start":872,"end":961,"inode":{"change":4,"pos":1047}}},"contents":[{"Add":"\tstruct hashed hashed;"},{"Add":"\tblake3_hasher b3sum;"},{"Add":"\tuint8_t output[BLAKE3_OUT_LEN];"},{"Add":"\tsize_t i;"}]}},{"Edit":{"inode":{"change":4,"pos":1047},"path":"change.c","line":158,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1373}],"down_context":[{"change":3,"pos":1373}],"flag":"BLOCK","start":962,"end":1400,"inode":{"change":4,"pos":1047}}},"contents":[{"Add":""},{"Add":"\t/* TODO Decode into 'struct hashed' */"},{"Add":""},{"Add":"\t/* Step 1. Compute the hash of the result buf! */"},{"Add":""},{"Add":"\tblake3_hasher_init(&b3sum);"},{"Add":"\tblake3_hasher_update(&b3sum, buf, hashed_len);"},{"Add":"\tblake3_hasher_finalize(&b3sum, output, BLAKE3_OUT_LEN);"},{"Add":""},{"Add":"\tfor (i = 0; i < BLAKE3_OUT_LEN; i++)"},{"Add":"\t\tprintf(\"%02x\", output[i]);"},{"Add":"\tprintf(\"\\n\");"},{"Add":""},{"Add":"\tif (expected_hash != NULL) {"},{"Add":"\t\tfor (i = 0; i < BLAKE3_OUT_LEN; i++)"},{"Add":"\t\t\tprintf(\"%02x\", expected_hash[i]);"},{"Add":"\t\tprintf(\"\\n\");"},{"Add":"\t}"},{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":1047},"path":"change.c","line":207,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":2620}],"down_context":[{"change":7,"pos":122}],"flag":"BLOCK","start":1401,"end":1429,"inode":{"change":4,"pos":1047}}},"contents":[{"Add":"\tuint8_t contents_hash[32];"}]}},{"Edit":{"inode":{"change":4,"pos":1047},"path":"change.c","line":227,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":2474}],"down_context":[{"change":4,"pos":2474}],"flag":"BLOCK","start":1430,"end":1472,"inode":{"change":4,"pos":1047}}},"contents":[{"Add":"\tbase32_decode_hash(contents_hash, hash);"}]}},{"Replacement":{"inode":{"change":4,"pos":1047},"path":"change.c","line":235,"ins":{"up_context":[{"change":3,"pos":1874}],"down_context":[{"change":3,"pos":1956}],"flag":"BLOCK","start":1473,"end":1570,"inode":{"change":4,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1874},"to":{"change":3,"start":1874,"end":1956},"introduced_by":3}],"inode":{"change":4,"pos":1047}},"ins_contents":[{"Add":"\terr = change_decode_hashed(fd, off.unhashed_off - OFFSETS_SIZE, off.hashed_len, contents_hash);"}],"del_contents":[{"Del":"\terr = change_decode_hashed(fd, off.unhashed_off - OFFSETS_SIZE, off.hashed_len);\n"}]}},{"FileAdd":{"meta":{"basename":"base32.h","metadata":0},"context":[{"change":8,"pos":1}],"contents":[{"Add":"#ifndef BASE32_H"},{"Add":"#define BASE32_H"},{"Add":""},{"Add":"/**"},{"Add":" * Takes care of decoding a base32-encoded blake3 hash sum."},{"Add":" *"},{"Add":" * The input is assumed to be an array of 53 base32 characters, dst is assumed"},{"Add":" * to be able to hold at least 32 bytes."},{"Add":" */"},{"Add":"void base32_decode_hash(uint8_t *dst, char const *in);"},{"Add":""},{"Add":"#endif"}]}},{"FileAdd":{"meta":{"basename":"base32.c","metadata":0},"context":[{"change":8,"pos":1}],"contents":[{"Add":"#include "},{"Add":""},{"Add":"/**"},{"Add":" * Inspired by the base32 implementation here:"},{"Add":" *"},{"Add":" * https://sourceforge.net/p/cyoencode/code/HEAD/tree/trunk/src/CyoDecode.c"},{"Add":" *"},{"Add":" * Basically, the idea is to allocate a much too large array, fill it with 0xff"},{"Add":" * and plug in the values from the alphabet in their corresponding holes."},{"Add":" */"},{"Add":"static uint8_t BASE32[0x80] = {"},{"Add":"\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, "},{"Add":"\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, "},{"Add":"\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, "},{"Add":"\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, "},{"Add":"\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, "},{"Add":"\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, "},{"Add":"\t0xff, 0xff, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, "},{"Add":"\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, "},{"Add":"\t0xff, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, "},{"Add":"\t0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, "},{"Add":"\t0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, "},{"Add":"\t0x17, 0x18, 0x19, 0xff, 0xff, 0xff, 0xff, 0xff, "},{"Add":"\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, "},{"Add":"\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, "},{"Add":"\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, "},{"Add":"\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff"},{"Add":"};"},{"Add":""},{"Add":"void"},{"Add":"base32_decode_hash(uint8_t *dst, char const *in)"},{"Add":"{"},{"Add":"\tint i, r, off;"},{"Add":"\tuint8_t v[8];"},{"Add":""},{"Add":"\tfor (r = 0; r < 6; r++) {"},{"Add":"\t\toff = 8 * r;"},{"Add":"\t\tfor (i = 0; i < 8; i++)"},{"Add":"\t\t\tv[i] = BASE32[(int)in[off + i]];"},{"Add":""},{"Add":"\t\toff = 5 * r;"},{"Add":"\t\tdst[off] = v[0] << 3 | v[1] >> 2;"},{"Add":"\t\tdst[off+1] = v[1] << 6 | v[2] << 1 | v[3] >> 4;"},{"Add":"\t\tdst[off+2] = v[3] << 4 | v[4] >> 1;"},{"Add":"\t\tdst[off+3] = v[4] << 7 | v[5] << 2 | v[6] >> 3;"},{"Add":"\t\tdst[off+4] = v[6] << 5 | v[7];"},{"Add":"\t}"},{"Add":"\t/* decode the remaining two bytes */"},{"Add":"\toff = 48; /* 6×8 */"},{"Add":"\tfor (i = 0; i < 5; i++)"},{"Add":"\t\tv[i] = BASE32[(int)in[off+i]];"},{"Add":""},{"Add":"\toff = 30; /* 6×5 */"},{"Add":"\tdst[off] = v[0] << 3 | v[1] >> 2;"},{"Add":"\tdst[off+1] = v[1] << 6 | v[2] << 1 | v[3] >> 4;"},{"Add":"}"}]}},{"Edit":{"inode":{"change":9,"pos":458},"path":"Makefile","line":23,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":53469}],"down_context":[{"change":2,"pos":53469}],"flag":"BLOCK","start":3725,"end":3742,"inode":{"change":9,"pos":458}}},"contents":[{"Add":"OBJS += base32.o"}]}}],"owner":"laumann","repo":"ani","token":"CkDocjiNxWvBGXUi3Mk4xTru0PVX9N3bxZh69BVCxg4=","login":null}

…

Dependencies

Change contents