KDF + BLAKE discrepancies

[guidovranken]

The behavior of KDFs with BLAKE is different since your recent BLAKE-related commits. So far I've observed discrepancies with other libraries with HKDF and PBKDF2, but there could be others as well.

#include <botan/kdf.h>
#include <botan/hash.h>

int main(void)
{
    const auto hasher = ::Botan::HashFunction::create("Blake2b(512)");
    const auto hash = hasher->final();
    for (size_t i = 0; i < hash.size(); i++) {
        printf("%02X ", hash[i]);
    }
    printf("\n");
    auto hkdf = ::Botan::KDF::create("HKDF(Blake2b(512))");
    const auto derived = hkdf->derive_key(16,
            std::vector<uint8_t>{},
            std::vector<uint8_t>{},
            std::vector<uint8_t>{});
    for (size_t i = 0; i < derived.size(); i++) {
        printf("%02X ", derived[i]);
    }
    printf("\n");
    return 0;
}

Output previously (commit 378072e):

78 6A 02 F7 42 01 59 03 C6 C6 FD 85 25 52 D2 72 91 2F 47 40 E1 58 47 61 8A 86 E2 17 F7 1F 54 19 D2 5E 10 31 AF EE 58 53 13 89 64 44 93 4E B0 4B 90 3A 68 5B 14 48 B7 55 D5 6F 70 1A FE 9B E2 CE 
52 06 A9 7D 30 36 7E CB 2D B3 37 21 E4 A7 47 36 

Output now (commit 83c949d):

78 6A 02 F7 42 01 59 03 C6 C6 FD 85 25 52 D2 72 91 2F 47 40 E1 58 47 61 8A 86 E2 17 F7 1F 54 19 D2 5E 10 31 AF EE 58 53 13 89 64 44 93 4E B0 4B 90 3A 68 5B 14 48 B7 55 D5 6F 70 1A FE 9B E2 CE 
AD 61 A6 64 11 ED 9C 9D 42 43 D7 78 94 56 D8 7B 

[randombit]

Yikes. Thanks. If nothing else that suggests a hole in the test suite, that this change was completely missed.

[randombit]

KDF and PBKDF2 both have logic for accepting either a MAC name or a hash name (in which case HMAC with that hash is used). However the logic was to first try creating it as a MAC, then falling back to HMAC, so when BLAKE2b was added as a MAC both your examples switched to using keyed BLAKE2 instead of BLAKE2 with HMAC. Fix is just to switch these.

[guidovranken]

HKDF fixed, still seeing discrepancies with PBKDF2, eg:

operation name: KDF_PBKDF2
--
  | digest: BLAKE2B512
  | password: {0x00, 0x91, 0xd8, 0xdb, 0xec, 0x26, 0x7c, 0x01} (8 bytes)
  | salt: {0x00, 0x1f, 0x00, 0x08, 0x2c, 0x49, 0x01, 0x1d} (8 bytes)
  | iterations: 4
  | keySize: 1023
  |  
  | Module libgcrypt result:
  |  
  | {0x68, 0x5b, 0x16, 0xec, 0x96, 0x05, 0xe4, 0xcf, 0x32, 0xb8, 0xda, 0x3d, 0x3d, 0x51, 0xd2, 0xa7,
  | 0x61, 0x41, 0x9c, 0xd1, 0xee, 0x3c, 0x39, 0x39, 0xf9, 0x94, 0xba, 0x3f, 0xa2, 0x6b, 0x8e, 0x89,
  | 0x9f, 0xee, 0x27, 0x79, 0xd2, 0x2f, 0xb0, 0xac, 0x02, 0xc8, 0x54, 0xc8, 0x35, 0x48, 0x25, 0x46,
  | 0xbe, 0x88, 0x9f, 0x3b, 0x40, 0x4d, 0x10, 0x0a, 0xf8, 0x7c, 0x72, 0x00, 0xf5, 0x5d, 0x18, 0xcd,
  | 0xc6, 0x20, 0xa9, 0xf7, 0x6e, 0x45, 0xed, 0x93, 0x28, 0xf7, 0xcb, 0xcf, 0x87, 0x3c, 0x7a, 0xc1,
  | 0x27, 0xfe, 0x14, 0x09, 0xc6, 0x9c, 0xc6, 0xb4, 0xe4, 0xb1, 0x12, 0xc7, 0x08, 0xeb, 0xe9, 0xd5,
  | 0x6f, 0xaf, 0x96, 0x22, 0x4f, 0x96, 0xd5, 0xd3, 0x82, 0xd3, 0x12, 0x6a, 0x79, 0xec, 0x32, 0xbc,
  | 0xd3, 0x9c, 0x98, 0x31, 0xab, 0x99, 0x57, 0x4a, 0xbf, 0xe3, 0xf6, 0x13, 0xaa, 0x37, 0xd7, 0xf6,
  | 0xde, 0x0c, 0xbe, 0x25, 0xa3, 0x05, 0x40, 0x49, 0x53, 0x00, 0x96, 0xe8, 0x05, 0xcc, 0x77, 0xd1,
  | 0xff, 0x04, 0x65, 0x52, 0x90, 0x37, 0xee, 0x25, 0xd0, 0xda, 0xae, 0xfe, 0xb6, 0x13, 0x9c, 0x72,
  | 0xab, 0x97, 0x69, 0x46, 0xc3, 0x7e, 0xe6, 0x0a, 0xe9, 0xb7, 0x9e, 0xbf, 0xaf, 0x65, 0x1f, 0xe0,
  | 0xc2, 0x75, 0x58, 0x3e, 0x90, 0x8e, 0xdf, 0x87, 0x7f, 0xf1, 0x6b, 0xf6, 0x7f, 0x11, 0xfc, 0xc2,
  | 0x7b, 0x6e, 0x4a, 0x85, 0xcb, 0xbe, 0x79, 0xfe, 0xd7, 0x2a, 0xed, 0xcf, 0xbf, 0x6b, 0xd2, 0xea,
  | 0x2d, 0x3d, 0x4d, 0x34, 0x11, 0x76, 0x06, 0xb2, 0x81, 0x29, 0x15, 0xf6, 0x66, 0x8c, 0x65, 0x3d,
  | 0x24, 0x3f, 0xad, 0x6f, 0x4e, 0x3e, 0x07, 0xdf, 0xa8, 0x60, 0xf3, 0x88, 0x63, 0x24, 0x45, 0xff,
  | 0x0b, 0x75, 0xa6, 0x34, 0x47, 0xe9, 0xd8, 0x4a, 0x7c, 0x19, 0x1f, 0xcc, 0x14, 0x6d, 0xb1, 0xd7,
  | 0xa6, 0x1f, 0x8b, 0x55, 0x4b, 0xe4, 0x83, 0x75, 0x25, 0x6a, 0x72, 0x21, 0x5c, 0xef, 0x6f, 0x74,
  | 0x86, 0x22, 0x33, 0x45, 0x4d, 0xa9, 0x3b, 0xdf, 0x1d, 0x6f, 0x48, 0xce, 0x58, 0xe6, 0xbc, 0xc9,
  | 0xf3, 0xad, 0x27, 0xaf, 0xc6, 0x99, 0xec, 0xd4, 0xf0, 0xa5, 0x7b, 0x60, 0xf8, 0xf2, 0xd7, 0x1c,
  | 0x96, 0xbc, 0x45, 0xed, 0x39, 0xd6, 0xce, 0xee, 0x7f, 0xd5, 0xb6, 0xad, 0xbf, 0xb4, 0xf4, 0xad,
  | 0xf3, 0x4f, 0x9d, 0x11, 0xf8, 0x99, 0xa6, 0x4e, 0x98, 0xcf, 0x95, 0x9a, 0x2e, 0xe6, 0x96, 0x52,
  | 0x29, 0x56, 0xfd, 0x05, 0x9e, 0xf9, 0x2d, 0xab, 0x74, 0xd3, 0x3f, 0x5d, 0xa5, 0xb4, 0x90, 0xd0,
  | 0xe6, 0xe2, 0x5b, 0x8d, 0xfb, 0x61, 0x29, 0x6f, 0xae, 0x1c, 0x30, 0x15, 0x18, 0x63, 0x5a, 0xdb,
  | 0x87, 0xac, 0xd5, 0x0e, 0x9e, 0xcd, 0x7e, 0x5d, 0x0c, 0xcf, 0x8b, 0x1a, 0x0b, 0x8d, 0xa6, 0x4d,
  | 0x49, 0x7a, 0xe0, 0xc0, 0x41, 0x55, 0x3e, 0x4c, 0xe5, 0x49, 0x9d, 0xff, 0xb3, 0x59, 0xa8, 0xda,
  | 0xd4, 0x02, 0x83, 0x84, 0xe4, 0x7c, 0x28, 0xff, 0x31, 0x96, 0xc2, 0x9d, 0x39, 0xab, 0xf4, 0xe4,
  | 0x04, 0x0e, 0x4a, 0x90, 0x88, 0x49, 0xd6, 0x3c, 0xb0, 0x43, 0xc1, 0x0e, 0x5e, 0x91, 0x81, 0x16,
  | 0xf3, 0x62, 0x83, 0x60, 0x22, 0xa2, 0x7b, 0x80, 0x4f, 0x4b, 0x33, 0x90, 0x7c, 0x4a, 0x1b, 0x9e,
  | 0x6c, 0x67, 0xae, 0x53, 0x9b, 0xc1, 0x6c, 0xcd, 0x45, 0xd0, 0xee, 0xf9, 0x13, 0x1d, 0x6d, 0x66,
  | 0x3a, 0x23, 0xaf, 0x32, 0xc7, 0x3a, 0x13, 0x97, 0xab, 0x86, 0x7f, 0xb3, 0xe8, 0x5e, 0xb5, 0x29,
  | 0xd1, 0x0d, 0x4a, 0x55, 0x37, 0x65, 0x50, 0x39, 0x25, 0x42, 0x95, 0x45, 0x0e, 0xbc, 0x7d, 0xf1,
  | 0xed, 0xea, 0x2a, 0xcf, 0xfa, 0x99, 0x50, 0x0f, 0x23, 0xa0, 0x3a, 0x7c, 0xcb, 0xd0, 0x0b, 0xdf,
  | 0xcb, 0x91, 0xa1, 0x3e, 0xcc, 0x76, 0x4d, 0xc7, 0x97, 0xa4, 0x0e, 0x71, 0x40, 0x4f, 0x1b, 0x12,
  | 0xb8, 0x8a, 0xdd, 0x3a, 0xdd, 0x06, 0x61, 0xea, 0xdd, 0xb1, 0xc5, 0x7a, 0x97, 0xb8, 0xa0, 0xec,
  | 0x71, 0x22, 0x52, 0x25, 0xe9, 0xa1, 0x92, 0x4d, 0xd8, 0xa0, 0x0a, 0xf1, 0xb0, 0x89, 0xc6, 0xea,
  | 0x70, 0x56, 0xdd, 0x87, 0x3c, 0x82, 0x35, 0xbb, 0xfe, 0x3f, 0x17, 0x9d, 0xc8, 0xd1, 0x53, 0x31,
  | 0xe9, 0xff, 0xbc, 0xf7, 0xab, 0xd3, 0xe3, 0x6b, 0x04, 0x8a, 0x45, 0x34, 0x83, 0xf2, 0x76, 0xe7,
  | 0x2f, 0x67, 0xc3, 0x1f, 0x75, 0x31, 0xf3, 0x0e, 0x30, 0xfb, 0x81, 0x59, 0xf6, 0x1e, 0xeb, 0xc3,
  | 0xaf, 0x29, 0x14, 0x66, 0x79, 0x07, 0x6e, 0x6e, 0xd9, 0x40, 0xac, 0xd6, 0xeb, 0x32, 0x51, 0xfc,
  | 0x93, 0x19, 0xa8, 0x83, 0x37, 0x25, 0x15, 0x1b, 0x2e, 0x0d, 0x48, 0x8c, 0xbf, 0x2d, 0x01, 0x4f,
  | 0x18, 0x37, 0xc4, 0x75, 0x18, 0xec, 0xb6, 0xec, 0xec, 0x6a, 0xea, 0x7d, 0x1b, 0x0e, 0x9c, 0xfe,
  | 0x86, 0xe9, 0x31, 0xa7, 0xf7, 0xf4, 0xc7, 0x65, 0x35, 0x5e, 0x9c, 0xa9, 0x8c, 0x38, 0x46, 0x54,
  | 0x50, 0x04, 0x74, 0x4d, 0x10, 0xc5, 0x05, 0x3e, 0x14, 0x3d, 0x89, 0x27, 0xf9, 0x56, 0x21, 0x5e,
  | 0x85, 0x1f, 0x86, 0xc4, 0xaa, 0xe2, 0xc0, 0x35, 0x63, 0x91, 0x2b, 0xac, 0x3c, 0x9c, 0x31, 0x93,
  | 0x80, 0x5e, 0x49, 0x97, 0x40, 0x65, 0x7a, 0x48, 0x91, 0x3a, 0xfc, 0x34, 0xa0, 0xe2, 0xe7, 0x95,
  | 0xe4, 0x0c, 0x3c, 0x02, 0x5f, 0x07, 0x5f, 0x8a, 0x05, 0x0f, 0xe0, 0x7a, 0x0e, 0x20, 0xc1, 0x25,
  | 0x04, 0x29, 0xf4, 0xd2, 0xe6, 0xf0, 0x17, 0xb8, 0xb4, 0xbf, 0x32, 0x4b, 0x21, 0x88, 0xd9, 0x1a,
  | 0x87, 0x30, 0x09, 0xf1, 0x0a, 0x4d, 0xea, 0x75, 0x9e, 0xc1, 0xa4, 0x8b, 0x9e, 0xfd, 0x67, 0xb4,
  | 0xac, 0x86, 0xe8, 0xe2, 0xbc, 0xfd, 0x02, 0xb0, 0xfc, 0x3a, 0x9d, 0xfc, 0x5b, 0xd2, 0xa1, 0x4b,
  | 0x6a, 0x88, 0x6b, 0xf1, 0x8b, 0xab, 0x8a, 0xeb, 0xe9, 0x45, 0x92, 0x18, 0x88, 0x43, 0xfb, 0x76,
  | 0x1f, 0xd5, 0xe5, 0x36, 0x2d, 0xf2, 0xd7, 0x7f, 0x56, 0x70, 0x96, 0x70, 0xfd, 0xc5, 0xae, 0x2b,
  | 0x84, 0xe7, 0x09, 0x2c, 0xbc, 0xf2, 0x76, 0x6b, 0xd4, 0x24, 0xb5, 0x1b, 0x29, 0xe2, 0x66, 0xc0,
  | 0x48, 0x5f, 0x99, 0x6c, 0xfe, 0x85, 0x33, 0x44, 0x63, 0x9c, 0x02, 0x5b, 0x01, 0x9e, 0x41, 0x4e,
  | 0x04, 0x7c, 0x8f, 0xd6, 0x8d, 0xea, 0x72, 0x15, 0x47, 0xb6, 0x9a, 0x91, 0x43, 0x15, 0xd3, 0x24,
  | 0x07, 0x3e, 0xcc, 0x50, 0x92, 0x0e, 0x86, 0x42, 0x02, 0xcd, 0x70, 0x0c, 0xbb, 0xd9, 0x0c, 0x7d,
  | 0xbc, 0x9e, 0x71, 0x09, 0x67, 0x4a, 0xa0, 0xd2, 0x2b, 0x5e, 0x52, 0x85, 0xd1, 0x55, 0xde, 0xed,
  | 0x28, 0x24, 0x24, 0xc2, 0x00, 0x1b, 0x79, 0x77, 0x4d, 0xa1, 0xe5, 0x49, 0xd8, 0xcf, 0x3b, 0x2c,
  | 0xc8, 0xf7, 0x1e, 0xfc, 0x3c, 0x25, 0x84, 0x5c, 0x1d, 0xfc, 0x03, 0x02, 0x3f, 0x62, 0xa4, 0x16,
  | 0x69, 0x58, 0x03, 0x44, 0xf2, 0x42, 0xa8, 0x74, 0x36, 0xd4, 0x60, 0x95, 0x10, 0x46, 0x0e, 0x55,
  | 0x33, 0x13, 0x14, 0x10, 0xfd, 0x9a, 0x5b, 0x61, 0x29, 0xac, 0x69, 0x75, 0xa9, 0x70, 0x26, 0x77,
  | 0x61, 0x83, 0xe8, 0xb3, 0x3b, 0xfa, 0xbf, 0x8d, 0x25, 0xad, 0x75, 0x9d, 0x9f, 0xa8, 0x2b, 0xba,
  | 0x1d, 0x0b, 0x2d, 0xc8, 0xc8, 0x42, 0x9e, 0x5c, 0x97, 0x81, 0x76, 0x9f, 0xb1, 0x91, 0x75, 0x87,
  | 0x2c, 0xdb, 0x36, 0x04, 0x34, 0x79, 0xa1, 0xc2, 0x22, 0xc2, 0xe9, 0x06, 0xd1, 0xf2, 0x3d, 0xca,
  | 0x82, 0x7a, 0xf2, 0xe2, 0xbb, 0x95, 0x6a, 0xa2, 0x83, 0x15, 0xf4, 0xf9, 0x6a, 0x95, 0x2c} (1023 bytes)
  |  
  | Module Botan result:
  |  
  | {0x94, 0xc1, 0x9b, 0xd3, 0x19, 0x61, 0xdf, 0x4d, 0xf1, 0x71, 0xaa, 0x42, 0x0a, 0x30, 0xd1, 0x21,
  | 0xbc, 0xac, 0x1d, 0xf1, 0x1e, 0xf7, 0xd6, 0x27, 0x5d, 0x3c, 0xf2, 0xb7, 0x4e, 0xf4, 0x85, 0xff,
  | 0xe3, 0x10, 0x25, 0xfc, 0x10, 0x95, 0x07, 0xfe, 0x7d, 0xdc, 0xc3, 0xee, 0xa0, 0x7c, 0x29, 0x0e,
  | 0xb5, 0x90, 0xe5, 0x41, 0xec, 0xae, 0x24, 0xbd, 0xb4, 0x6a, 0x83, 0xf1, 0x0e, 0x2c, 0x6d, 0x56,
  | 0xd8, 0xa4, 0xfd, 0xef, 0x84, 0xff, 0x1c, 0xef, 0xc2, 0x0c, 0xf4, 0xc0, 0xd1, 0x01, 0x12, 0xe7,
  | 0x9c, 0x72, 0xcd, 0x7e, 0x75, 0xf2, 0x23, 0x57, 0x26, 0x35, 0x39, 0xad, 0xa4, 0xa8, 0x76, 0x68,
  | 0x82, 0x3b, 0x37, 0xc9, 0xbd, 0xbb, 0x55, 0x55, 0x26, 0x50, 0x72, 0x54, 0x14, 0x22, 0x1c, 0x09,
  | 0xf2, 0xc4, 0xb1, 0x78, 0x5c, 0x97, 0x96, 0x39, 0xfe, 0xa0, 0xd2, 0x9d, 0x54, 0x83, 0x69, 0x93,
  | 0x38, 0x77, 0xa6, 0xa8, 0x90, 0xba, 0xbd, 0x0c, 0x49, 0x7f, 0x11, 0xd7, 0x88, 0x7d, 0x92, 0x40,
  | 0x20, 0xde, 0x64, 0x95, 0xba, 0x68, 0xb6, 0x99, 0xf8, 0x11, 0xa1, 0x56, 0x42, 0x7c, 0x1c, 0x91,
  | 0xc2, 0x36, 0x58, 0x61, 0xc5, 0x76, 0x70, 0x35, 0xca, 0x88, 0x4c, 0x7d, 0x33, 0xfe, 0x72, 0x2c,
  | 0x51, 0x0b, 0x9f, 0xe1, 0x9b, 0x51, 0x7f, 0x48, 0x99, 0xa3, 0x5d, 0x49, 0xd4, 0x28, 0x75, 0x70,
  | 0xcb, 0x95, 0x6b, 0xf3, 0xac, 0xc8, 0xc9, 0x4b, 0xb5, 0x41, 0xa5, 0xc1, 0x21, 0xe2, 0x0f, 0xc9,
  | 0x2e, 0xe1, 0xe1, 0x76, 0x3c, 0x43, 0xb5, 0xfd, 0x58, 0x58, 0x9d, 0xda, 0x50, 0x74, 0xa8, 0x80,
  | 0xad, 0x45, 0x89, 0xdb, 0x9f, 0x75, 0xd6, 0x44, 0xe8, 0x73, 0x93, 0x15, 0x56, 0x27, 0xdb, 0xcc,
  | 0x9f, 0x9e, 0x85, 0x49, 0x70, 0xc1, 0x45, 0x70, 0xa8, 0x4d, 0x77, 0x8d, 0x9b, 0x6d, 0x90, 0x2e,
  | 0x94, 0x42, 0xbe, 0xa7, 0xe7, 0x7e, 0x2c, 0xa7, 0x1f, 0x23, 0xa0, 0x40, 0x3c, 0x5d, 0x16, 0x69,
  | 0xf9, 0x45, 0x83, 0xa2, 0xd6, 0xee, 0xc6, 0xf0, 0xd3, 0xa8, 0xf7, 0x05, 0x74, 0x15, 0xee, 0x5e,
  | 0xc6, 0xe9, 0xe3, 0xf1, 0x09, 0x8d, 0xbf, 0xb3, 0x78, 0xac, 0x38, 0x50, 0xf1, 0x2b, 0xbe, 0x12,
  | 0xbb, 0x71, 0x5b, 0x62, 0xb0, 0x04, 0x48, 0xa9, 0xcc, 0x31, 0xcd, 0x14, 0x39, 0x1b, 0xf3, 0x4b,
  | 0xae, 0xe0, 0x59, 0x62, 0xe6, 0x78, 0x22, 0xa4, 0xc4, 0xac, 0xed, 0x6b, 0xfd, 0x2d, 0x11, 0xbc,
  | 0xe9, 0x6e, 0x42, 0x48, 0xb8, 0xbc, 0xe5, 0xa1, 0x5a, 0x09, 0x19, 0xb2, 0xcb, 0xc1, 0x83, 0x2f,
  | 0xfb, 0x2b, 0x2c, 0x0c, 0x43, 0xc1, 0x8b, 0xaa, 0xa5, 0x92, 0xa4, 0xa1, 0xce, 0xc9, 0xcd, 0x52,
  | 0x28, 0x57, 0x71, 0xba, 0xc9, 0x58, 0x4a, 0x3c, 0x19, 0x5f, 0x00, 0x81, 0x00, 0xb6, 0x4d, 0x17,
  | 0x74, 0xdc, 0x62, 0x24, 0x56, 0xbd, 0xda, 0xfd, 0x02, 0x5b, 0xeb, 0x7b, 0x33, 0x02, 0xa8, 0x6d,
  | 0x6d, 0x0a, 0x6a, 0x25, 0x96, 0xf8, 0xeb, 0x36, 0x5d, 0xdb, 0x1a, 0x6a, 0x57, 0xe7, 0x54, 0x7d,
  | 0x9a, 0x0f, 0x46, 0x22, 0x67, 0xfd, 0x7d, 0x52, 0xbc, 0x8c, 0x24, 0x99, 0xcb, 0x8e, 0x70, 0xec,
  | 0x99, 0xe8, 0x9b, 0xf7, 0xdc, 0x70, 0xa3, 0x52, 0xf6, 0xd6, 0x9d, 0x38, 0xbf, 0x52, 0x5e, 0xcc,
  | 0x82, 0x5b, 0xac, 0x22, 0x38, 0x4e, 0x24, 0x71, 0xe1, 0xfe, 0x5d, 0xca, 0xde, 0xc1, 0x50, 0xa4,
  | 0x29, 0x9b, 0xbf, 0x2a, 0x29, 0xeb, 0xff, 0xba, 0xbc, 0xcb, 0x08, 0x24, 0xad, 0xa5, 0xb4, 0x90,
  | 0xa6, 0x1e, 0xe4, 0xe2, 0x22, 0xde, 0x81, 0x18, 0x1f, 0x20, 0x0d, 0x9d, 0xd1, 0x24, 0x51, 0xfc,
  | 0x45, 0x3f, 0x7f, 0xb7, 0xed, 0xda, 0x39, 0xf7, 0xe2, 0xfa, 0x97, 0xd5, 0x1c, 0xe9, 0x59, 0x3c,
  | 0xd1, 0x9b, 0xac, 0x6a, 0x35, 0xe5, 0x3d, 0xf3, 0xaf, 0xf8, 0x17, 0x15, 0x8a, 0x0b, 0x67, 0xe7,
  | 0xfd, 0x24, 0x2a, 0x4b, 0xe5, 0xd0, 0xd4, 0x8c, 0xa6, 0x4c, 0x83, 0x4c, 0x21, 0x33, 0x4a, 0x34,
  | 0x5d, 0xbf, 0x08, 0x8f, 0x18, 0xae, 0x52, 0x45, 0x21, 0x8d, 0xc8, 0x13, 0xac, 0x71, 0xd2, 0x5e,
  | 0x28, 0x3e, 0x0e, 0x96, 0x43, 0x83, 0x9c, 0xb7, 0x3c, 0x41, 0xdb, 0x7d, 0xb4, 0x2d, 0x76, 0xb9,
  | 0xe4, 0x4e, 0x38, 0xa2, 0x19, 0x86, 0xfd, 0xc7, 0x93, 0x01, 0xf2, 0xd2, 0x5f, 0x64, 0xd6, 0xbd,
  | 0x6b, 0x73, 0xff, 0x83, 0xc6, 0x30, 0x54, 0x29, 0xbe, 0x7a, 0xc5, 0xdb, 0x4f, 0xdb, 0xd2, 0xba,
  | 0x29, 0x4b, 0x68, 0xd5, 0xb3, 0x1e, 0x95, 0x8c, 0xe8, 0x71, 0x8b, 0x38, 0x1d, 0x25, 0xe7, 0xea,
  | 0x31, 0x86, 0xf3, 0x70, 0x87, 0x64, 0x0a, 0xf3, 0xb5, 0x91, 0x3f, 0x99, 0xbe, 0xf6, 0x06, 0x21,
  | 0xa0, 0x6b, 0x6e, 0xff, 0x23, 0xa8, 0x31, 0x28, 0x89, 0xe4, 0x61, 0xb8, 0x50, 0xeb, 0x38, 0xaf,
  | 0x4f, 0x0e, 0x48, 0x78, 0xcf, 0xfe, 0x9b, 0x84, 0x1a, 0xc0, 0xb3, 0xff, 0x0f, 0xa7, 0x09, 0xad,
  | 0x8d, 0xec, 0xe0, 0x3f, 0xa9, 0x20, 0x9c, 0x15, 0x3b, 0x71, 0x38, 0x87, 0x2b, 0xe9, 0xcc, 0x9c,
  | 0xc9, 0x18, 0x54, 0x1b, 0x1a, 0xcb, 0xd5, 0x2a, 0x50, 0x7b, 0x5f, 0x6e, 0x70, 0x67, 0x03, 0x04,
  | 0x32, 0xbc, 0x00, 0x4c, 0xe3, 0x50, 0x07, 0xf1, 0x96, 0x6c, 0x58, 0x40, 0xc4, 0xa8, 0x92, 0x4c,
  | 0xef, 0xc6, 0x97, 0xff, 0x5d, 0x0b, 0x7e, 0x27, 0xc7, 0xfd, 0xf8, 0x1a, 0x4b, 0x8a, 0x8d, 0x72,
  | 0x6a, 0x50, 0xb6, 0x8e, 0xf9, 0xd5, 0xa9, 0x0d, 0x4e, 0x00, 0x71, 0x94, 0xe2, 0xa7, 0x25, 0x80,
  | 0x18, 0xd0, 0x59, 0x87, 0x23, 0x7f, 0xec, 0x05, 0x7c, 0x9b, 0xd5, 0x5a, 0x6a, 0xec, 0x8b, 0xf0,
  | 0xb2, 0xa0, 0xcf, 0x37, 0x88, 0xac, 0x06, 0x37, 0xc2, 0x0f, 0x99, 0x5f, 0x6f, 0xec, 0xd7, 0x5b,
  | 0x53, 0x13, 0x6a, 0x8b, 0x87, 0x8b, 0x06, 0xba, 0x89, 0xa3, 0x14, 0xff, 0x38, 0x2e, 0x9b, 0x8a,
  | 0x7a, 0x5c, 0x10, 0x92, 0xff, 0xbf, 0x50, 0x96, 0xfe, 0x58, 0x0a, 0xf3, 0x06, 0xfd, 0x05, 0x9e,
  | 0x2b, 0xe2, 0xcf, 0x93, 0xd5, 0xe9, 0x51, 0xec, 0xed, 0xea, 0x5f, 0x0d, 0x63, 0xf6, 0xe7, 0xff,
  | 0x73, 0x3e, 0xb2, 0x71, 0xec, 0xd3, 0xb6, 0x57, 0x71, 0x06, 0x4f, 0x41, 0x5b, 0xae, 0x5b, 0x28,
  | 0x4b, 0xb5, 0xd6, 0xfe, 0xf1, 0x88, 0x8e, 0xbe, 0xc1, 0x7a, 0xed, 0x88, 0x39, 0x6b, 0x79, 0xec,
  | 0x1e, 0xc8, 0x95, 0x36, 0xf0, 0xd2, 0x74, 0x77, 0x87, 0xd4, 0xcf, 0x17, 0xa2, 0x5c, 0xcf, 0x6f,
  | 0xc0, 0x2b, 0xf4, 0xbe, 0x3c, 0x14, 0x2a, 0x1b, 0x53, 0xa0, 0xd6, 0x3e, 0x24, 0xd2, 0x35, 0x7c,
  | 0xa7, 0xb9, 0x80, 0xff, 0x17, 0x86, 0x92, 0x5b, 0x8b, 0x56, 0x61, 0xad, 0x00, 0x57, 0x0f, 0xce,
  | 0xe4, 0x08, 0xbf, 0x9b, 0x5c, 0x41, 0x82, 0x31, 0x8e, 0x5f, 0x8b, 0x1e, 0x9e, 0xfd, 0xd4, 0x24,
  | 0x06, 0x47, 0x74, 0x48, 0x2c, 0x28, 0xe7, 0x9a, 0xf0, 0xd3, 0xf0, 0xf2, 0x7e, 0x00, 0xf0, 0x8a,
  | 0x17, 0x02, 0xb1, 0xe9, 0x3b, 0x2f, 0xd0, 0xf7, 0xce, 0x3d, 0x4f, 0xc1, 0x9f, 0x5f, 0xcd, 0x82,
  | 0xaf, 0x3a, 0x75, 0xd7, 0xc8, 0xc1, 0xd8, 0x6d, 0x12, 0xe9, 0x24, 0xea, 0xaf, 0x9c, 0xc5, 0x3d,
  | 0x44, 0xd3, 0x58, 0x9a, 0x10, 0x34, 0xac, 0xff, 0xc7, 0x1c, 0xb9, 0x25, 0x1d, 0xb8, 0x75, 0x02,
  | 0x18, 0xfc, 0x6f, 0x26, 0x00, 0x63, 0x34, 0x40, 0xa7, 0xb5, 0xe3, 0x93, 0xe8, 0x7d, 0x13, 0x64,
  | 0x65, 0x67, 0xd6, 0x5b, 0xb4, 0xbe, 0x6d, 0x37, 0xb2, 0x92, 0x24, 0x92, 0xed, 0x3b, 0xf9} (1023 bytes)

[randombit]

@guidovranken There was one place I missed making the necessary change, should be resolved now.