Fix generation of certs_test.h

Fix formatting of certs_test.h:
- remove trailing spaces
- change leading tab stops to spaces
This commit is contained in:
Sean Parkinson 2019-02-25 09:00:26 +10:00
parent 8bb4e23f8d
commit feea036ec9
2 changed files with 2922 additions and 2924 deletions

View File

@ -38,7 +38,10 @@ my @fileList_ecc = (
# Used with HAVE_ED25519 define. # Used with HAVE_ED25519 define.
my @fileList_ed = ( my @fileList_ed = (
[ "./certs/ed25519/server-ed25519.der", "server_ed25519_cert" ], [ "./certs/ed25519/server-ed25519.der", "server_ed25519_cert" ],
[ "./certs/ed25519/ca-ed25519.der", "ca_ed25519_cert" ] [ "./certs/ed25519/server-ed25519-key.der", "server_ed25519_key" ],
[ "./certs/ed25519/ca-ed25519.der", "ca_ed25519_cert" ],
[ "./certs/ed25519/client-ed25519.der", "client_ed25519_cert" ],
[ "./certs/ed25519/client-ed25519-key.der", "client_ed25519_key" ]
); );
# 1024-bit certs/keys to be converted # 1024-bit certs/keys to be converted
@ -223,7 +226,10 @@ sub file_to_hex {
for (my $i = 0, my $j = 1; $i < $fileLen; $i++, $j++) for (my $i = 0, my $j = 1; $i < $fileLen; $i++, $j++)
{ {
if ($j == 1) { if ($j == 1) {
print OUT_FILE "\t"; print OUT_FILE " ";
}
if ($j != 1) {
print OUT_FILE " ";
} }
read($fp, $byte, 1) or die "Error reading $fileName"; read($fp, $byte, 1) or die "Error reading $fileName";
my $output = sprintf("0x%02X", ord($byte)); my $output = sprintf("0x%02X", ord($byte));

View File

@ -3036,14 +3036,18 @@ static const unsigned char server_ed25519_cert[] =
}; };
static const int sizeof_server_ed25519_cert = sizeof(server_ed25519_cert); static const int sizeof_server_ed25519_cert = sizeof(server_ed25519_cert);
/* ./certs/ed25519/server-ed25519-key.der, ED25519 */
static const unsigned char server_ed25519_key[] = static const unsigned char server_ed25519_key[] =
{ {
0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x30, 0x52, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2B,
0x03, 0x2b, 0x65, 0x70, 0x04, 0x22, 0x04, 0x20, 0x65, 0x70, 0x04, 0x22, 0x04, 0x20, 0x02, 0x2F, 0xC5, 0xFF,
0x02, 0x2f, 0xc5, 0xff, 0xba, 0x8e, 0xd0, 0xd2, 0xBA, 0x8E, 0xD0, 0xD2, 0xBF, 0x03, 0x8E, 0x76, 0x8F, 0xC8,
0xbf, 0x03, 0x8e, 0x76, 0x8f, 0xc8, 0x86, 0x80, 0x86, 0x80, 0x71, 0x87, 0x97, 0x31, 0xE2, 0x40, 0xAC, 0xDF,
0x71, 0x87, 0x97, 0x31, 0xe2, 0x40, 0xac, 0xdf, 0xBB, 0x90, 0x15, 0x52, 0x6E, 0x24, 0xA1, 0x39, 0xA1, 0x22,
0xbb, 0x90, 0x15, 0x52, 0x6e, 0x24, 0xa1, 0x39 0x04, 0x20, 0x61, 0x5D, 0xEC, 0xB7, 0x45, 0x93, 0xC9, 0x84,
0x7B, 0x68, 0x21, 0x4A, 0x4D, 0xF4, 0x04, 0x8B, 0xBD, 0xCD,
0x6C, 0x5D, 0x3D, 0xB7, 0x62, 0x2C, 0x2D, 0x25, 0xC3, 0x22,
0x49, 0xC8, 0x86, 0xF2
}; };
static const int sizeof_server_ed25519_key = sizeof(server_ed25519_key); static const int sizeof_server_ed25519_key = sizeof(server_ed25519_key);
@ -3116,96 +3120,84 @@ static const unsigned char ca_ed25519_cert[] =
static const int sizeof_ca_ed25519_cert = sizeof(ca_ed25519_cert); static const int sizeof_ca_ed25519_cert = sizeof(ca_ed25519_cert);
/* ./certs/ed25519/client-ed25519.der, ED25519 */ /* ./certs/ed25519/client-ed25519.der, ED25519 */
static unsigned char client_ed25519_cert[] = static const unsigned char client_ed25519_cert[] =
{ {
0x30, 0x82, 0x02, 0x58, 0x30, 0x82, 0x02, 0x0a, 0x30, 0x82, 0x02, 0x58, 0x30, 0x82, 0x02, 0x0A, 0xA0, 0x03,
0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x10, 0x00, 0x02, 0x01, 0x02, 0x02, 0x10, 0x00, 0x8F, 0x2F, 0x35, 0xB2,
0x8f, 0x2f, 0x35, 0xb2, 0x53, 0xbd, 0x4f, 0x92, 0x53, 0xBD, 0x4F, 0x92, 0xD1, 0xFF, 0x1D, 0x4B, 0x40, 0xA5,
0xd1, 0xff, 0x1d, 0x4b, 0x40, 0xa5, 0x49, 0x30, 0x49, 0x30, 0x05, 0x06, 0x03, 0x2B, 0x65, 0x70, 0x30, 0x81,
0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x30, 0x81, 0xA1, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06,
0xa1, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x13, 0x02, 0x55, 0x53, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03,
0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x10, 0x55, 0x04, 0x08, 0x0C, 0x07, 0x4D, 0x6F, 0x6E, 0x74, 0x61,
0x30, 0x0e, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0c, 0x6E, 0x61, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04,
0x07, 0x4d, 0x6f, 0x6e, 0x74, 0x61, 0x6e, 0x61, 0x07, 0x0C, 0x07, 0x42, 0x6F, 0x7A, 0x65, 0x6D, 0x61, 0x6E,
0x31, 0x10, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x04, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x03, 0x55, 0x04, 0x04, 0x0C,
0x07, 0x0c, 0x07, 0x42, 0x6f, 0x7a, 0x65, 0x6d, 0x06, 0x63, 0x6C, 0x69, 0x65, 0x6E, 0x74, 0x31, 0x10, 0x30,
0x61, 0x6e, 0x31, 0x0f, 0x30, 0x0d, 0x06, 0x03, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x0C, 0x07, 0x77, 0x6F,
0x55, 0x04, 0x04, 0x0c, 0x06, 0x63, 0x6c, 0x69, 0x6C, 0x66, 0x53, 0x53, 0x4C, 0x31, 0x10, 0x30, 0x0E, 0x06,
0x65, 0x6e, 0x74, 0x31, 0x10, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x0C, 0x07, 0x45, 0x44, 0x32, 0x35,
0x03, 0x55, 0x04, 0x0a, 0x0c, 0x07, 0x77, 0x6f, 0x35, 0x31, 0x39, 0x31, 0x18, 0x30, 0x16, 0x06, 0x03, 0x55,
0x6c, 0x66, 0x53, 0x53, 0x4c, 0x31, 0x10, 0x30, 0x04, 0x03, 0x0C, 0x0F, 0x77, 0x77, 0x77, 0x2E, 0x77, 0x6F,
0x0e, 0x06, 0x03, 0x55, 0x04, 0x0b, 0x0c, 0x07, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F, 0x6D, 0x31,
0x45, 0x44, 0x32, 0x35, 0x35, 0x31, 0x39, 0x31, 0x1F, 0x30, 0x1D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7,
0x18, 0x30, 0x16, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0D, 0x01, 0x09, 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66, 0x6F,
0x0c, 0x0f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x6f, 0x40, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63,
0x6c, 0x66, 0x73, 0x73, 0x6c, 0x2e, 0x63, 0x6f, 0x6F, 0x6D, 0x30, 0x22, 0x18, 0x0F, 0x32, 0x30, 0x31, 0x38,
0x6d, 0x31, 0x1f, 0x30, 0x1d, 0x06, 0x09, 0x2a, 0x30, 0x34, 0x31, 0x32, 0x31, 0x36, 0x32, 0x32, 0x31, 0x37,
0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x09, 0x01, 0x5A, 0x18, 0x0F, 0x32, 0x30, 0x32, 0x31, 0x30, 0x31, 0x30,
0x16, 0x10, 0x69, 0x6e, 0x66, 0x6f, 0x40, 0x77, 0x37, 0x31, 0x35, 0x32, 0x32, 0x31, 0x37, 0x5A, 0x30, 0x81,
0x6f, 0x6c, 0x66, 0x73, 0x73, 0x6c, 0x2e, 0x63, 0xA1, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06,
0x6f, 0x6d, 0x30, 0x22, 0x18, 0x0f, 0x32, 0x30, 0x13, 0x02, 0x55, 0x53, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03,
0x31, 0x38, 0x30, 0x34, 0x31, 0x32, 0x31, 0x36, 0x55, 0x04, 0x08, 0x0C, 0x07, 0x4D, 0x6F, 0x6E, 0x74, 0x61,
0x32, 0x32, 0x31, 0x37, 0x5a, 0x18, 0x0f, 0x32, 0x6E, 0x61, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04,
0x30, 0x32, 0x31, 0x30, 0x31, 0x30, 0x37, 0x31, 0x07, 0x0C, 0x07, 0x42, 0x6F, 0x7A, 0x65, 0x6D, 0x61, 0x6E,
0x35, 0x32, 0x32, 0x31, 0x37, 0x5a, 0x30, 0x81, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x03, 0x55, 0x04, 0x04, 0x0C,
0xa1, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x06, 0x63, 0x6C, 0x69, 0x65, 0x6E, 0x74, 0x31, 0x10, 0x30,
0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x10, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x0C, 0x07, 0x77, 0x6F,
0x30, 0x0e, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0c, 0x6C, 0x66, 0x53, 0x53, 0x4C, 0x31, 0x10, 0x30, 0x0E, 0x06,
0x07, 0x4d, 0x6f, 0x6e, 0x74, 0x61, 0x6e, 0x61, 0x03, 0x55, 0x04, 0x0B, 0x0C, 0x07, 0x45, 0x44, 0x32, 0x35,
0x31, 0x10, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x04, 0x35, 0x31, 0x39, 0x31, 0x18, 0x30, 0x16, 0x06, 0x03, 0x55,
0x07, 0x0c, 0x07, 0x42, 0x6f, 0x7a, 0x65, 0x6d, 0x04, 0x03, 0x0C, 0x0F, 0x77, 0x77, 0x77, 0x2E, 0x77, 0x6F,
0x61, 0x6e, 0x31, 0x0f, 0x30, 0x0d, 0x06, 0x03, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F, 0x6D, 0x31,
0x55, 0x04, 0x04, 0x0c, 0x06, 0x63, 0x6c, 0x69, 0x1F, 0x30, 0x1D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7,
0x65, 0x6e, 0x74, 0x31, 0x10, 0x30, 0x0e, 0x06, 0x0D, 0x01, 0x09, 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66, 0x6F,
0x03, 0x55, 0x04, 0x0a, 0x0c, 0x07, 0x77, 0x6f, 0x40, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63,
0x6c, 0x66, 0x53, 0x53, 0x4c, 0x31, 0x10, 0x30, 0x6F, 0x6D, 0x30, 0x2A, 0x30, 0x05, 0x06, 0x03, 0x2B, 0x65,
0x0e, 0x06, 0x03, 0x55, 0x04, 0x0b, 0x0c, 0x07, 0x70, 0x03, 0x21, 0x00, 0xA2, 0xF1, 0x26, 0x40, 0x9B, 0xA2,
0x45, 0x44, 0x32, 0x35, 0x35, 0x31, 0x39, 0x31, 0x59, 0xDA, 0xDB, 0xE6, 0x15, 0x7F, 0x9A, 0x11, 0xB5, 0x48,
0x18, 0x30, 0x16, 0x06, 0x03, 0x55, 0x04, 0x03, 0x5F, 0x55, 0xBA, 0x5E, 0xED, 0x46, 0xF7, 0x98, 0x67, 0xBE,
0x0c, 0x0f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x6f, 0x0C, 0x93, 0xE3, 0xA4, 0x8E, 0x18, 0xA3, 0x52, 0x30, 0x50,
0x6c, 0x66, 0x73, 0x73, 0x6c, 0x2e, 0x63, 0x6f, 0x30, 0x1D, 0x06, 0x03, 0x55, 0x1D, 0x0E, 0x04, 0x16, 0x04,
0x6d, 0x31, 0x1f, 0x30, 0x1d, 0x06, 0x09, 0x2a, 0x14, 0xFE, 0x01, 0x46, 0x7F, 0x6F, 0x2B, 0x3E, 0x1C, 0xB0,
0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x09, 0x01, 0x6F, 0xE1, 0xCC, 0x4D, 0x02, 0x25, 0xF7, 0x4D, 0x0A, 0x95,
0x16, 0x10, 0x69, 0x6e, 0x66, 0x6f, 0x40, 0x77, 0xB8, 0x30, 0x1F, 0x06, 0x03, 0x55, 0x1D, 0x23, 0x04, 0x18,
0x6f, 0x6c, 0x66, 0x73, 0x73, 0x6c, 0x2e, 0x63, 0x30, 0x16, 0x80, 0x14, 0xFE, 0x01, 0x46, 0x7F, 0x6F, 0x2B,
0x6f, 0x6d, 0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x3E, 0x1C, 0xB0, 0x6F, 0xE1, 0xCC, 0x4D, 0x02, 0x25, 0xF7,
0x2b, 0x65, 0x70, 0x03, 0x21, 0x00, 0xa2, 0xf1, 0x4D, 0x0A, 0x95, 0xB8, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x1D,
0x26, 0x40, 0x9b, 0xa2, 0x59, 0xda, 0xdb, 0xe6, 0x0F, 0x01, 0x01, 0xFF, 0x04, 0x04, 0x03, 0x02, 0x06, 0xC0,
0x15, 0x7f, 0x9a, 0x11, 0xb5, 0x48, 0x5f, 0x55, 0x30, 0x05, 0x06, 0x03, 0x2B, 0x65, 0x70, 0x03, 0x41, 0x00,
0xba, 0x5e, 0xed, 0x46, 0xf7, 0x98, 0x67, 0xbe, 0x29, 0xF6, 0x69, 0xE2, 0xB9, 0x73, 0x12, 0xD1, 0x64, 0xEB,
0x0c, 0x93, 0xe3, 0xa4, 0x8e, 0x18, 0xa3, 0x52, 0x8F, 0xE9, 0x6B, 0x61, 0xDB, 0x5F, 0xE9, 0xA7, 0x62, 0x6C,
0x30, 0x50, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x10, 0x89, 0x41, 0x80, 0xE3, 0xE8, 0xFD, 0x1F, 0xD0, 0x13,
0x0e, 0x04, 0x16, 0x04, 0x14, 0xfe, 0x01, 0x46, 0xAE, 0x95, 0x00, 0xAF, 0xF7, 0x77, 0xE1, 0x22, 0x32, 0xAD,
0x7f, 0x6f, 0x2b, 0x3e, 0x1c, 0xb0, 0x6f, 0xe1, 0x46, 0x4F, 0xDC, 0x7E, 0xFE, 0xAE, 0xBC, 0x8A, 0x1F, 0x96,
0xcc, 0x4d, 0x02, 0x25, 0xf7, 0x4d, 0x0a, 0x95, 0x0A, 0xDA, 0x9F, 0xC9, 0x93, 0x52, 0x27, 0x18, 0xB0, 0x8B,
0xb8, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0xDA, 0xBE, 0x81, 0x09
0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xfe, 0x01,
0x46, 0x7f, 0x6f, 0x2b, 0x3e, 0x1c, 0xb0, 0x6f,
0xe1, 0xcc, 0x4d, 0x02, 0x25, 0xf7, 0x4d, 0x0a,
0x95, 0xb8, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x1d,
0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03, 0x02,
0x06, 0xc0, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65,
0x70, 0x03, 0x41, 0x00, 0x29, 0xf6, 0x69, 0xe2,
0xb9, 0x73, 0x12, 0xd1, 0x64, 0xeb, 0x8f, 0xe9,
0x6b, 0x61, 0xdb, 0x5f, 0xe9, 0xa7, 0x62, 0x6c,
0x10, 0x89, 0x41, 0x80, 0xe3, 0xe8, 0xfd, 0x1f,
0xd0, 0x13, 0xae, 0x95, 0x00, 0xaf, 0xf7, 0x77,
0xe1, 0x22, 0x32, 0xad, 0x46, 0x4f, 0xdc, 0x7e,
0xfe, 0xae, 0xbc, 0x8a, 0x1f, 0x96, 0x0a, 0xda,
0x9f, 0xc9, 0x93, 0x52, 0x27, 0x18, 0xb0, 0x8b,
0xda, 0xbe, 0x81, 0x09
}; };
static const int sizeof_client_ed25519_cert = sizeof(client_ed25519_cert); static const int sizeof_client_ed25519_cert = sizeof(client_ed25519_cert);
/* ./certs/ed25519/client-ed25519-key.der, ED25519 */ /* ./certs/ed25519/client-ed25519-key.der, ED25519 */
static unsigned char client_ed25519_key[] = static const unsigned char client_ed25519_key[] =
{ {
0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x30, 0x52, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2B,
0x03, 0x2b, 0x65, 0x70, 0x04, 0x22, 0x04, 0x20, 0x65, 0x70, 0x04, 0x22, 0x04, 0x20, 0x27, 0xA3, 0x34, 0x2A,
0x27, 0xa3, 0x34, 0x2a, 0x35, 0xd4, 0xbb, 0xb8, 0x35, 0xD4, 0xBB, 0xB8, 0xE1, 0xDC, 0xD8, 0xEC, 0x0F, 0xC1,
0xe1, 0xdc, 0xd8, 0xec, 0x0f, 0xc1, 0xa0, 0xd1, 0xA0, 0xD1, 0xA2, 0x5C, 0xF9, 0x06, 0xF0, 0x44, 0x5D, 0x3B,
0xa2, 0x5c, 0xf9, 0x06, 0xf0, 0x44, 0x5d, 0x3b, 0x97, 0x4D, 0xBD, 0xDF, 0x4A, 0x3B, 0xA3, 0x4E, 0xA1, 0x22,
0x97, 0x4d, 0xbd, 0xdf, 0x4a, 0x3b, 0xa3, 0x4e 0x04, 0x20, 0xA2, 0xF1, 0x26, 0x40, 0x9B, 0xA2, 0x59, 0xDA,
0xDB, 0xE6, 0x15, 0x7F, 0x9A, 0x11, 0xB5, 0x48, 0x5F, 0x55,
0xBA, 0x5E, 0xED, 0x46, 0xF7, 0x98, 0x67, 0xBE, 0x0C, 0x93,
0xE3, 0xA4, 0x8E, 0x18
}; };
static const int sizeof_client_ed25519_key = sizeof(client_ed25519_key); static const int sizeof_client_ed25519_key = sizeof(client_ed25519_key);