diff --git a/certs/client-ecc-cert.pem b/certs/client-ecc-cert.pem index 4d0448fc4..c6e222e09 100644 --- a/certs/client-ecc-cert.pem +++ b/certs/client-ecc-cert.pem @@ -1,17 +1,16 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: - bf:cc:cb:7a:0a:07:42:82 - Signature Algorithm: ecdsa-with-SHA1 - Issuer: C=US, ST=Oregon, L=Salem, O=Client ECC, OU=Fast, CN=www.yassl.com/emailAddress=info@yassl.com + Serial Number: 10761354931173564369 (0x9558034b367f9fd1) + Signature Algorithm: ecdsa-with-SHA1 + Issuer: C=US, ST=Montana, L=Bozeman, O=wolfSSL, OU=Programming, CN=www.wolfssl.com/emailAddress=info@wolfssl.com Validity - Not Before: May 1 23:51:33 2012 GMT - Not After : Jan 26 23:51:33 2015 GMT - Subject: C=US, ST=Oregon, L=Salem, O=Client ECC, OU=Fast, CN=www.yassl.com/emailAddress=info@yassl.com + Not Before: Feb 2 15:59:46 2015 GMT + Not After : Oct 29 15:59:46 2017 GMT + Subject: C=US, ST=Montana, L=Bozeman, O=wolfSSL, OU=Programming, CN=www.wolfssl.com/emailAddress=info@wolfssl.com Subject Public Key Info: Public Key Algorithm: id-ecPublicKey - EC Public Key: + Public-Key: (256 bit) pub: 04:55:bf:f4:0f:44:50:9a:3d:ce:9b:b7:f0:c5:4d: f5:70:7b:d4:ec:24:8e:19:80:ec:5a:4c:a2:24:03: @@ -24,31 +23,32 @@ Certificate: EB:D4:4B:59:6B:95:61:3F:51:57:B6:04:4D:89:41:88:44:5C:AB:F2 X509v3 Authority Key Identifier: keyid:EB:D4:4B:59:6B:95:61:3F:51:57:B6:04:4D:89:41:88:44:5C:AB:F2 - DirName:/C=US/ST=Oregon/L=Salem/O=Client ECC/OU=Fast/CN=www.yassl.com/emailAddress=info@yassl.com - serial:BF:CC:CB:7A:0A:07:42:82 + DirName:/C=US/ST=Montana/L=Bozeman/O=wolfSSL/OU=Programming/CN=www.wolfssl.com/emailAddress=info@wolfssl.com + serial:95:58:03:4B:36:7F:9F:D1 X509v3 Basic Constraints: CA:TRUE Signature Algorithm: ecdsa-with-SHA1 - 30:44:02:20:26:08:44:95:35:2e:fa:9d:20:01:a6:79:60:ed: - 35:a7:0a:dd:7a:0e:75:c5:80:d2:0b:9f:6a:90:d6:31:76:75: - 02:20:2d:87:a2:bb:d5:e2:42:61:35:19:59:40:1d:fd:71:4f: - 28:65:96:99:e6:85:1b:09:ad:d4:58:71:56:63:0b:c7 + 30:45:02:21:00:a5:ad:1f:db:11:32:91:8d:4e:a9:25:6d:a1: + af:e5:0e:f6:47:0a:f2:6a:f5:b3:27:3e:93:3b:d6:b2:a9:3f: + 2a:02:20:55:13:2a:1c:77:57:3c:ce:c3:a8:43:cd:78:cb:89: + 30:11:83:98:e6:2a:47:67:39:38:0f:52:95:61:39:aa:5d -----BEGIN CERTIFICATE----- -MIIC+jCCAqKgAwIBAgIJAL/My3oKB0KCMAkGByqGSM49BAEwgYkxCzAJBgNVBAYT -AlVTMQ8wDQYDVQQIEwZPcmVnb24xDjAMBgNVBAcTBVNhbGVtMRMwEQYDVQQKEwpD -bGllbnQgRUNDMQ0wCwYDVQQLEwRGYXN0MRYwFAYDVQQDEw13d3cueWFzc2wuY29t -MR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTAeFw0xMjA1MDEyMzUxMzNa -Fw0xNTAxMjYyMzUxMzNaMIGJMQswCQYDVQQGEwJVUzEPMA0GA1UECBMGT3JlZ29u -MQ4wDAYDVQQHEwVTYWxlbTETMBEGA1UEChMKQ2xpZW50IEVDQzENMAsGA1UECxME -RmFzdDEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEdMBsGCSqGSIb3DQEJARYOaW5m -b0B5YXNzbC5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARVv/QPRFCaPc6b -t/DFTfVwe9TsJI4ZgOxaTKIkA2Ism9rvojUSQ4R2FsZWlQbMAam99nUaQve9qbI2 -Il/HXX+0o4HxMIHuMB0GA1UdDgQWBBTr1EtZa5VhP1FXtgRNiUGIRFyr8jCBvgYD -VR0jBIG2MIGzgBTr1EtZa5VhP1FXtgRNiUGIRFyr8qGBj6SBjDCBiTELMAkGA1UE -BhMCVVMxDzANBgNVBAgTBk9yZWdvbjEOMAwGA1UEBxMFU2FsZW0xEzARBgNVBAoT -CkNsaWVudCBFQ0MxDTALBgNVBAsTBEZhc3QxFjAUBgNVBAMTDXd3dy55YXNzbC5j -b20xHTAbBgkqhkiG9w0BCQEWDmluZm9AeWFzc2wuY29tggkAv8zLegoHQoIwDAYD -VR0TBAUwAwEB/zAJBgcqhkjOPQQBA0cAMEQCICYIRJU1LvqdIAGmeWDtNacK3XoO -dcWA0gufapDWMXZ1AiAth6K71eJCYTUZWUAd/XFPKGWWmeaFGwmt1FhxVmMLxw== +MIIDHDCCAsOgAwIBAgIJAJVYA0s2f5/RMAkGByqGSM49BAEwgZQxCzAJBgNVBAYT +AlVTMRAwDgYDVQQIDAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMRAwDgYDVQQK +DAd3b2xmU1NMMRQwEgYDVQQLDAtQcm9ncmFtbWluZzEYMBYGA1UEAwwPd3d3Lndv +bGZzc2wuY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMB4XDTE1 +MDIwMjE1NTk0NloXDTE3MTAyOTE1NTk0NlowgZQxCzAJBgNVBAYTAlVTMRAwDgYD +VQQIDAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMRAwDgYDVQQKDAd3b2xmU1NM +MRQwEgYDVQQLDAtQcm9ncmFtbWluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29t +MR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMFkwEwYHKoZIzj0CAQYI +KoZIzj0DAQcDQgAEVb/0D0RQmj3Om7fwxU31cHvU7CSOGYDsWkyiJANiLJva76I1 +EkOEdhbGVpUGzAGpvfZ1GkL3vamyNiJfx11/tKOB/DCB+TAdBgNVHQ4EFgQU69RL +WWuVYT9RV7YETYlBiERcq/IwgckGA1UdIwSBwTCBvoAU69RLWWuVYT9RV7YETYlB +iERcq/KhgZqkgZcwgZQxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5hMRAw +DgYDVQQHDAdCb3plbWFuMRAwDgYDVQQKDAd3b2xmU1NMMRQwEgYDVQQLDAtQcm9n +cmFtbWluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29tMR8wHQYJKoZIhvcNAQkB +FhBpbmZvQHdvbGZzc2wuY29tggkAlVgDSzZ/n9EwDAYDVR0TBAUwAwEB/zAJBgcq +hkjOPQQBA0gAMEUCIQClrR/bETKRjU6pJW2hr+UO9kcK8mr1syc+kzvWsqk/KgIg +VRMqHHdXPM7DqEPNeMuJMBGDmOYqR2c5OA9SlWE5ql0= -----END CERTIFICATE----- diff --git a/certs/renewcerts.sh b/certs/renewcerts.sh index 1c213f39f..1332e35d0 100755 --- a/certs/renewcerts.sh +++ b/certs/renewcerts.sh @@ -1,4 +1,23 @@ #!/bin/bash +# renewcerts.sh +# +# renews the following: +# client-cert.pem +# client-cert.der +# client-ecc-cert.pem +# ca-cert.pem +# ca-cert.der +# server-cert.pem +# server-cert.der +# server-ecc-rsa.pem +# crl/cliCrl.pem +# crl/crl.pem +# crl/crl.revoked +# crl/eccCliCRL.pem +# crl/eccSrvCRL.pem +# if HAVE_NTRU +# ntru-cert.pem +# ntru-key.raw ############################################################################### ######################## FUNCTIONS SECTION #################################### ############################################################################### @@ -70,6 +89,20 @@ function run_renewcerts(){ openssl x509 -in server-ecc-rsa.pem -text > tmp.pem mv tmp.pem server-ecc-rsa.pem + ############################################################ + ####### update the self-signed client-ecc-cert.pem ######### + ############################################################ + echo "Updating client-ecc-cert.pem" + echo "" + #pipe the following arguments to openssl req... + echo -e "US\nMontana\nBozeman\nwolfSSL\nProgramming\nwww.wolfssl.com\ninfo@wolfssl.com\n.\n.\n" | openssl req -new -key ecc-client-key.pem -nodes -out client-ecc-cert.csr + + + openssl x509 -req -in client-ecc-cert.csr -days 1000 -extfile wolfssl.cnf -extensions wolfssl_opts -signkey ecc-client-key.pem -out client-ecc-cert.pem + rm client-ecc-cert.csr + + openssl x509 -in client-ecc-cert.pem -text > tmp.pem + mv tmp.pem client-ecc-cert.pem ############################################################ ########## make .der files from .pem files ################# @@ -225,7 +258,7 @@ else echo "" move_ntru - + echo "ntru-certs, and ntru-key.raw have been updated" echo "" diff --git a/cyassl/certs_test.h b/cyassl/certs_test.h index ce3fb53a4..c8465ac85 100644 --- a/cyassl/certs_test.h +++ b/cyassl/certs_test.h @@ -1,3 +1,10 @@ /* certs_test.h */ #include + +#ifndef CYASSL_CERTS_TEST_H + #define CYASSL_CERTS_TEST_H WOLFSSL_CERTS_TEST_H +#else + #undef CYASSL_CERTS_TEST_H + #define CYASSL_CERTS_TEST_H WOLFSSL_CERTS_TEST_H +#endif diff --git a/cyassl/ctaocrypt/settings_comp.h b/cyassl/ctaocrypt/settings_comp.h index 041c6594f..89278a2db 100644 --- a/cyassl/ctaocrypt/settings_comp.h +++ b/cyassl/ctaocrypt/settings_comp.h @@ -35,6 +35,9 @@ #endif /* have rsa and HAVE_FIPS */ /* Macro redefinitions for compatibility */ +#ifdef HAVE_NTRU + #define MakeNtruCert wc_MakeNtruCert +#endif #if defined(WOLFSSL_SHA512) && !defined(CYASSL_SHA512) #define CYASSL_SHA512 #endif diff --git a/gencertbuf.pl b/gencertbuf.pl index 01ef9c70f..257b17b0b 100755 --- a/gencertbuf.pl +++ b/gencertbuf.pl @@ -13,7 +13,7 @@ use warnings; # ---- SCRIPT SETTINGS ------------------------------------------------------- # output C header file to write cert/key buffers to -my $outputFile = "./cyassl/certs_test.h"; +my $outputFile = "./wolfssl/certs_test.h"; # 1024-bit certs/keys to be converted # Used with USE_CERT_BUFFERS_1024 define. @@ -49,8 +49,8 @@ my $num_2048 = @fileList_2048; open OUT_FILE, "+>", $outputFile or die $!; print OUT_FILE "/* certs_test.h */\n\n"; -print OUT_FILE "#ifndef CYASSL_CERTS_TEST_H\n"; -print OUT_FILE "#define CYASSL_CERTS_TEST_H\n\n"; +print OUT_FILE "#ifndef WOLFSSL_CERTS_TEST_H\n"; +print OUT_FILE "#define WOLFSSL_CERTS_TEST_H\n\n"; # convert and print 1024-bit cert/keys print OUT_FILE "#ifdef USE_CERT_BUFFERS_1024\n\n"; diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c index 37387dbb8..13cfb6c25 100644 --- a/wolfcrypt/src/asn.c +++ b/wolfcrypt/src/asn.c @@ -5827,7 +5827,7 @@ int wc_MakeCert(Cert* cert, byte* derBuffer, word32 derSz, RsaKey* rsaKey, #ifdef HAVE_NTRU -int MakeNtruCert(Cert* cert, byte* derBuffer, word32 derSz, +int wc_MakeNtruCert(Cert* cert, byte* derBuffer, word32 derSz, const byte* ntruKey, word16 keySz, RNG* rng) { return MakeAnyCert(cert, derBuffer, derSz, NULL, NULL, rng, ntruKey, keySz); diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index 7b3e2c5a2..3d1a7a881 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -3793,7 +3793,7 @@ int rsa_test(void) free(pem); return -453; } - ret = RsaPrivateKeyDecode(tmp, &idx3, &caKey, (word32)bytes); + ret = wc_RsaPrivateKeyDecode(tmp, &idx3, &caKey, (word32)bytes); if (ret != 0) { free(derCert); free(pem); @@ -3818,7 +3818,7 @@ int rsa_test(void) return -455; } - certSz = MakeNtruCert(&myCert, derCert, FOURK_BUF, public_key, + certSz = wc_MakeNtruCert(&myCert, derCert, FOURK_BUF, public_key, public_key_len, &rng); if (certSz < 0) { free(derCert); diff --git a/wolfssl/certs_test.h b/wolfssl/certs_test.h index 665ff75d1..95bec9356 100644 --- a/wolfssl/certs_test.h +++ b/wolfssl/certs_test.h @@ -424,8 +424,8 @@ const int sizeof_client_key_der_2048 = sizeof(client_key_der_2048); const unsigned char client_cert_der_2048[] = { 0x30, 0x82, 0x04, 0xAA, 0x30, 0x82, 0x03, 0x92, 0xA0, 0x03, - 0x02, 0x01, 0x02, 0x02, 0x09, 0x00, 0xB6, 0x63, 0xAF, 0x8F, - 0x5D, 0x62, 0x57, 0xA0, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, + 0x02, 0x01, 0x02, 0x02, 0x09, 0x00, 0xCE, 0xF3, 0x95, 0x66, + 0x10, 0xDB, 0xD0, 0xFF, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x05, 0x05, 0x00, 0x30, 0x81, 0x94, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x10, 0x30, 0x0E, 0x06, @@ -442,10 +442,10 @@ const unsigned char client_cert_der_2048[] = 0x1D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66, 0x6F, 0x40, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F, 0x6D, - 0x30, 0x1E, 0x17, 0x0D, 0x31, 0x34, 0x30, 0x37, 0x31, 0x31, - 0x31, 0x37, 0x33, 0x39, 0x34, 0x34, 0x5A, 0x17, 0x0D, 0x31, - 0x37, 0x30, 0x34, 0x30, 0x36, 0x31, 0x37, 0x33, 0x39, 0x34, - 0x34, 0x5A, 0x30, 0x81, 0x94, 0x31, 0x0B, 0x30, 0x09, 0x06, + 0x30, 0x1E, 0x17, 0x0D, 0x31, 0x35, 0x30, 0x32, 0x30, 0x32, + 0x31, 0x35, 0x35, 0x39, 0x34, 0x36, 0x5A, 0x17, 0x0D, 0x31, + 0x37, 0x31, 0x30, 0x32, 0x39, 0x31, 0x35, 0x35, 0x39, 0x34, + 0x36, 0x5A, 0x30, 0x81, 0x94, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C, 0x07, 0x4D, 0x6F, 0x6E, 0x74, 0x61, 0x6E, 0x61, 0x31, 0x10, 0x30, 0x0E, @@ -513,36 +513,36 @@ const unsigned char client_cert_der_2048[] = 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66, 0x6F, 0x40, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x09, 0x00, - 0xB6, 0x63, 0xAF, 0x8F, 0x5D, 0x62, 0x57, 0xA0, 0x30, 0x0C, + 0xCE, 0xF3, 0x95, 0x66, 0x10, 0xDB, 0xD0, 0xFF, 0x30, 0x0C, 0x06, 0x03, 0x55, 0x1D, 0x13, 0x04, 0x05, 0x30, 0x03, 0x01, 0x01, 0xFF, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x05, 0x05, 0x00, 0x03, 0x82, 0x01, - 0x01, 0x00, 0x85, 0x10, 0x90, 0xC5, 0x5D, 0xDE, 0x25, 0x8C, - 0xF2, 0x57, 0x7B, 0x2D, 0x14, 0x1C, 0x05, 0xF9, 0x71, 0x63, - 0x40, 0xB0, 0xE3, 0xC1, 0xC1, 0x2E, 0x13, 0x2A, 0x7A, 0xB7, - 0xD6, 0x24, 0x58, 0x87, 0xEB, 0x03, 0xFB, 0x0D, 0xAF, 0xE0, - 0xF4, 0xD0, 0xC8, 0xBC, 0x51, 0x36, 0x10, 0x4F, 0x79, 0xCC, - 0x4F, 0x66, 0x7D, 0xAF, 0x99, 0xCB, 0x7B, 0xCE, 0x68, 0x94, - 0xC6, 0x36, 0xAA, 0x42, 0x6E, 0x8C, 0x78, 0x5B, 0xB2, 0x85, - 0xCA, 0xD1, 0xE1, 0xA8, 0x31, 0xD1, 0x81, 0xD9, 0xF9, 0xC1, - 0xA3, 0x9E, 0x34, 0x43, 0xEF, 0x0A, 0x79, 0x7D, 0x3E, 0x83, - 0x61, 0xFC, 0x14, 0x5C, 0xD1, 0xDD, 0xBC, 0x0E, 0xD7, 0x51, - 0xB7, 0x71, 0x6E, 0x41, 0x7E, 0x8B, 0x2C, 0x5A, 0x9A, 0xCB, - 0x77, 0x4B, 0x6A, 0xF5, 0x06, 0xFF, 0x02, 0xAF, 0x1E, 0xE6, - 0x63, 0x4F, 0xBC, 0x44, 0xD9, 0x3F, 0x56, 0x9E, 0x09, 0x9C, - 0x43, 0xF9, 0x55, 0x21, 0x32, 0x46, 0x82, 0x09, 0x86, 0xA9, - 0x7B, 0x74, 0x1C, 0x9E, 0x5A, 0x2A, 0xBF, 0x03, 0x79, 0x91, - 0xCB, 0xF2, 0x29, 0x7F, 0xC9, 0x15, 0x82, 0x89, 0xB9, 0x53, - 0xCD, 0x7E, 0x07, 0x90, 0xA9, 0x5D, 0x76, 0xE1, 0x19, 0x5E, - 0x0D, 0x58, 0xB8, 0x59, 0xD5, 0x0D, 0xDF, 0x23, 0xAB, 0x6B, - 0x63, 0x76, 0x19, 0x9E, 0x9C, 0xDF, 0xB0, 0x57, 0x49, 0x6C, - 0xD0, 0x86, 0x97, 0xC3, 0x6C, 0x3C, 0xFA, 0xE0, 0x56, 0xC2, - 0x1B, 0xE3, 0xA1, 0x42, 0x1A, 0x58, 0x62, 0x85, 0x9D, 0x74, - 0x19, 0x83, 0x08, 0xAF, 0x59, 0x90, 0xF8, 0x99, 0xBD, 0x67, - 0xD3, 0x4A, 0xEA, 0x0E, 0xC9, 0xCA, 0x61, 0x8A, 0x0D, 0x8A, - 0x42, 0xCC, 0x90, 0xE9, 0x2E, 0xC2, 0x54, 0x73, 0x7F, 0x5E, - 0xAF, 0x8D, 0xE2, 0x32, 0xCB, 0x45, 0x20, 0xD6, 0x19, 0x4D, - 0x5B, 0x77, 0x31, 0xCC, 0x0F, 0x2D, 0xC0, 0x7E + 0x01, 0x00, 0xB1, 0x24, 0x1B, 0xB1, 0xE1, 0x92, 0xB9, 0xB8, + 0x7E, 0xA6, 0x79, 0x69, 0x12, 0x45, 0xF3, 0x53, 0xA9, 0xFE, + 0x3C, 0xF8, 0x39, 0x55, 0xC5, 0xB6, 0x34, 0xA3, 0xC0, 0x67, + 0x73, 0xAE, 0xDB, 0xB7, 0xD4, 0xE0, 0x70, 0x1A, 0xEE, 0xA2, + 0x2A, 0x72, 0xAD, 0x70, 0x8F, 0x49, 0xFE, 0x35, 0x5C, 0x7F, + 0x1C, 0xE7, 0x86, 0x96, 0x9E, 0xF3, 0x32, 0xC4, 0x34, 0x72, + 0xF5, 0xF3, 0x61, 0xE9, 0xA3, 0x34, 0xBF, 0xC3, 0x71, 0x31, + 0x83, 0x48, 0x28, 0x41, 0xB4, 0x3A, 0xA0, 0x3E, 0x03, 0x0F, + 0xD2, 0xF0, 0x3B, 0xD6, 0xBD, 0xF0, 0x2D, 0x9F, 0xE4, 0xFA, + 0xEF, 0xFA, 0x2A, 0x3A, 0x15, 0xE8, 0x50, 0x70, 0x50, 0xAA, + 0x55, 0xF8, 0xD1, 0x62, 0xA5, 0x99, 0xD3, 0x21, 0x82, 0x23, + 0xD6, 0xE5, 0x74, 0x6A, 0xE3, 0xC7, 0x00, 0x57, 0xE2, 0x1F, + 0xCB, 0xD6, 0x9B, 0xB1, 0xA0, 0x11, 0x8E, 0x9B, 0xF7, 0x58, + 0x4F, 0xEF, 0x91, 0x5B, 0x4D, 0x48, 0x26, 0x7F, 0xC2, 0xCF, + 0x7A, 0x3E, 0x41, 0x6E, 0x4B, 0x24, 0xFC, 0x38, 0x4F, 0x97, + 0x0E, 0xD6, 0x73, 0xEB, 0xBB, 0x9B, 0x31, 0x97, 0xE8, 0x54, + 0x62, 0x66, 0xC4, 0xEA, 0x93, 0x5A, 0x71, 0x36, 0x3C, 0xA5, + 0x4D, 0x9B, 0xB8, 0x31, 0xA6, 0x66, 0x7F, 0xEF, 0xD2, 0xA8, + 0x52, 0x6F, 0xE7, 0x29, 0xAD, 0xB7, 0x3D, 0x4F, 0x35, 0x40, + 0xF0, 0x14, 0xC7, 0xC7, 0xE5, 0xF3, 0x07, 0xEE, 0x77, 0x37, + 0x04, 0xBF, 0xCC, 0xDE, 0x74, 0x68, 0x2F, 0xAE, 0x4E, 0x76, + 0x6A, 0x89, 0xFD, 0x82, 0xEA, 0x35, 0xBF, 0x74, 0xD6, 0x6C, + 0xD8, 0xB3, 0x93, 0xA6, 0xFE, 0xC8, 0xAF, 0x3C, 0x6F, 0x8D, + 0xDC, 0xCC, 0xF9, 0x55, 0xF9, 0x3B, 0x1C, 0xF9, 0x22, 0xBB, + 0xBA, 0xEE, 0x55, 0x82, 0x17, 0xD7, 0x54, 0x87, 0x9C, 0x33, + 0x11, 0x34, 0x1A, 0xC8, 0x40, 0x06, 0x25, 0x79 }; const int sizeof_client_cert_der_2048 = sizeof(client_cert_der_2048); @@ -799,8 +799,8 @@ const int sizeof_rsa_key_der_2048 = sizeof(rsa_key_der_2048); const unsigned char ca_cert_der_2048[] = { 0x30, 0x82, 0x04, 0xAA, 0x30, 0x82, 0x03, 0x92, 0xA0, 0x03, - 0x02, 0x01, 0x02, 0x02, 0x09, 0x00, 0x9A, 0x41, 0x47, 0xCD, - 0xA1, 0x14, 0x62, 0x8C, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, + 0x02, 0x01, 0x02, 0x02, 0x09, 0x00, 0xB0, 0x09, 0x88, 0x5C, + 0x39, 0x56, 0xA5, 0x81, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x05, 0x05, 0x00, 0x30, 0x81, 0x94, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x10, 0x30, 0x0E, 0x06, @@ -817,10 +817,10 @@ const unsigned char ca_cert_der_2048[] = 0x1D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66, 0x6F, 0x40, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F, 0x6D, - 0x30, 0x1E, 0x17, 0x0D, 0x31, 0x34, 0x30, 0x37, 0x31, 0x31, - 0x30, 0x33, 0x32, 0x30, 0x30, 0x38, 0x5A, 0x17, 0x0D, 0x31, - 0x37, 0x30, 0x34, 0x30, 0x36, 0x30, 0x33, 0x32, 0x30, 0x30, - 0x38, 0x5A, 0x30, 0x81, 0x94, 0x31, 0x0B, 0x30, 0x09, 0x06, + 0x30, 0x1E, 0x17, 0x0D, 0x31, 0x35, 0x30, 0x32, 0x30, 0x32, + 0x31, 0x35, 0x35, 0x39, 0x34, 0x36, 0x5A, 0x17, 0x0D, 0x31, + 0x37, 0x31, 0x30, 0x32, 0x39, 0x31, 0x35, 0x35, 0x39, 0x34, + 0x36, 0x5A, 0x30, 0x81, 0x94, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C, 0x07, 0x4D, 0x6F, 0x6E, 0x74, 0x61, 0x6E, 0x61, 0x31, 0x10, 0x30, 0x0E, @@ -888,36 +888,36 @@ const unsigned char ca_cert_der_2048[] = 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66, 0x6F, 0x40, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x09, 0x00, - 0x9A, 0x41, 0x47, 0xCD, 0xA1, 0x14, 0x62, 0x8C, 0x30, 0x0C, + 0xB0, 0x09, 0x88, 0x5C, 0x39, 0x56, 0xA5, 0x81, 0x30, 0x0C, 0x06, 0x03, 0x55, 0x1D, 0x13, 0x04, 0x05, 0x30, 0x03, 0x01, 0x01, 0xFF, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x05, 0x05, 0x00, 0x03, 0x82, 0x01, - 0x01, 0x00, 0x79, 0x78, 0x0C, 0x6D, 0x79, 0x88, 0x91, 0xFC, - 0x3A, 0x15, 0x9C, 0xF9, 0x27, 0x62, 0x16, 0xF0, 0x21, 0x1F, - 0xFA, 0x7D, 0x3F, 0xA2, 0xA8, 0x32, 0x1E, 0xF7, 0xF2, 0x11, - 0xA9, 0x74, 0x16, 0x74, 0x5E, 0xDC, 0x18, 0xCA, 0xF0, 0x00, - 0x2A, 0xD5, 0x03, 0x06, 0x26, 0x30, 0xF1, 0x47, 0x83, 0xFD, - 0x32, 0x6E, 0xFC, 0xED, 0xAA, 0x4F, 0x7D, 0x0C, 0x63, 0x60, - 0x31, 0x2F, 0x7C, 0x0C, 0xBF, 0x99, 0x66, 0x87, 0xED, 0x27, - 0x08, 0x86, 0x2D, 0xC4, 0x33, 0xE8, 0x98, 0x23, 0x1C, 0xFE, - 0xA3, 0xDB, 0x9A, 0x49, 0x4E, 0xFC, 0x5A, 0x42, 0xEF, 0x71, - 0xC3, 0x3F, 0xAD, 0xDC, 0x4A, 0xA8, 0xD2, 0xA3, 0x1D, 0x09, - 0xAC, 0x33, 0x04, 0x7B, 0x86, 0xF3, 0x6D, 0x00, 0x59, 0xA3, - 0xC8, 0xDB, 0xD1, 0x3C, 0x73, 0xF6, 0x0E, 0x90, 0xD6, 0x5E, - 0x49, 0xE0, 0xBF, 0x36, 0x63, 0x08, 0x7B, 0xA5, 0xB0, 0x8F, - 0x35, 0x3B, 0x56, 0x8C, 0x11, 0x35, 0x49, 0x04, 0x1C, 0xD0, - 0xE7, 0xBA, 0x56, 0xC5, 0x0D, 0x0A, 0x91, 0x8D, 0xD6, 0xB7, - 0x62, 0x19, 0x34, 0x12, 0x52, 0x4C, 0xD2, 0x6D, 0x7C, 0xC5, - 0x3D, 0x0F, 0x18, 0x81, 0x54, 0xCB, 0xF6, 0x3C, 0xE5, 0x84, - 0xD2, 0xD6, 0x71, 0x15, 0xEC, 0x1A, 0x34, 0x0B, 0xF0, 0xA0, - 0x21, 0x74, 0x43, 0xC8, 0xA3, 0xB0, 0xDF, 0xD9, 0x67, 0xDA, - 0xE2, 0xAD, 0x93, 0x48, 0xF8, 0xA0, 0x87, 0xBD, 0x79, 0x14, - 0xE0, 0x62, 0x0A, 0xDF, 0xF7, 0x31, 0x2E, 0x31, 0x7B, 0xD1, - 0x32, 0x2A, 0x0A, 0xFE, 0x5D, 0x14, 0xEF, 0xD9, 0x64, 0x50, - 0xE4, 0x83, 0x91, 0xBC, 0x70, 0x0D, 0xD7, 0x88, 0x8D, 0xD9, - 0xBC, 0x84, 0x0E, 0xC5, 0x1A, 0xB3, 0xBF, 0x64, 0x02, 0x4E, - 0x51, 0x91, 0xA4, 0xA2, 0x85, 0x15, 0x83, 0xAF, 0xF0, 0x5B, - 0x9B, 0x28, 0x49, 0x5F, 0xB2, 0xB3, 0x03, 0xD8 + 0x01, 0x00, 0x06, 0x13, 0x32, 0x71, 0x02, 0x38, 0xFD, 0x6E, + 0x38, 0xCA, 0x3E, 0x8C, 0x4D, 0x1D, 0xD3, 0xF2, 0xB2, 0x37, + 0x6A, 0x70, 0x0A, 0xAB, 0xAC, 0xFA, 0xC0, 0xCB, 0x69, 0xDF, + 0xD9, 0x66, 0xA3, 0x67, 0x54, 0x2B, 0x00, 0x31, 0xCA, 0xD3, + 0x88, 0x88, 0x4D, 0xCE, 0xC0, 0xCC, 0xA4, 0xD3, 0x5B, 0x4C, + 0x6A, 0x30, 0x3F, 0x88, 0xF6, 0x49, 0x3B, 0x91, 0x83, 0x06, + 0x38, 0x4C, 0xB4, 0xE3, 0x80, 0xE9, 0x20, 0x26, 0x03, 0x4D, + 0x10, 0x4B, 0xA7, 0xB0, 0x46, 0x15, 0x9A, 0xDA, 0xEC, 0x08, + 0xE9, 0x13, 0x00, 0x26, 0x2B, 0xFE, 0x5C, 0x57, 0xAF, 0x8E, + 0x4D, 0xE4, 0x47, 0xE6, 0xB9, 0xA9, 0x20, 0x44, 0xBA, 0x21, + 0x4B, 0x0B, 0xCB, 0x3E, 0x7D, 0x0D, 0x65, 0x76, 0x2C, 0x51, + 0xA2, 0xF4, 0xB8, 0x6E, 0xA0, 0x3D, 0x69, 0x9F, 0x97, 0xAB, + 0xAE, 0xCC, 0x3A, 0xE5, 0x53, 0x54, 0xD8, 0xC6, 0xDD, 0x05, + 0x30, 0xBE, 0xA9, 0x30, 0xD0, 0xB3, 0x8B, 0x49, 0xB6, 0xD0, + 0xD0, 0xC5, 0x09, 0x47, 0x0C, 0x9E, 0x79, 0xA3, 0x2C, 0x28, + 0xB3, 0x0A, 0x64, 0xFC, 0x17, 0x89, 0x32, 0x35, 0x18, 0xBA, + 0xCF, 0x92, 0x3A, 0x8B, 0x12, 0x7A, 0xF2, 0xA9, 0x38, 0xF8, + 0x8C, 0x1A, 0x26, 0x83, 0x9B, 0x42, 0xD8, 0xA5, 0x5A, 0x7E, + 0x91, 0xEA, 0x12, 0x35, 0xF5, 0xB1, 0xCB, 0x8F, 0x73, 0x6F, + 0x4C, 0x1A, 0xFF, 0x3F, 0xFC, 0xFB, 0x08, 0x9B, 0xC3, 0x61, + 0x74, 0x0F, 0x8B, 0x39, 0x75, 0x5B, 0x0D, 0x2D, 0x71, 0xF9, + 0xA5, 0xA6, 0xC3, 0xE8, 0xCE, 0x46, 0x33, 0x0E, 0x47, 0xA4, + 0x50, 0x54, 0xE4, 0x87, 0xFA, 0xE4, 0x7E, 0xAE, 0xB1, 0x5C, + 0x3B, 0x64, 0xD6, 0x68, 0xB8, 0x30, 0x15, 0xFC, 0xD3, 0xD4, + 0xF2, 0x1B, 0xCC, 0x33, 0x66, 0x3B, 0x03, 0x4C, 0x68, 0x1C, + 0xCA, 0x1A, 0xBA, 0x1D, 0x30, 0x7F, 0x68, 0xF3 }; const int sizeof_ca_cert_der_2048 = sizeof(ca_cert_der_2048); @@ -1068,10 +1068,10 @@ const unsigned char server_cert_der_2048[] = 0x1F, 0x30, 0x1D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66, 0x6F, 0x40, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, 0x6C, 0x2E, 0x63, - 0x6F, 0x6D, 0x30, 0x1E, 0x17, 0x0D, 0x31, 0x34, 0x30, 0x37, - 0x31, 0x31, 0x31, 0x37, 0x32, 0x30, 0x31, 0x34, 0x5A, 0x17, - 0x0D, 0x31, 0x37, 0x30, 0x34, 0x30, 0x36, 0x31, 0x37, 0x32, - 0x30, 0x31, 0x34, 0x5A, 0x30, 0x81, 0x90, 0x31, 0x0B, 0x30, + 0x6F, 0x6D, 0x30, 0x1E, 0x17, 0x0D, 0x31, 0x35, 0x30, 0x32, + 0x30, 0x32, 0x31, 0x35, 0x35, 0x39, 0x34, 0x36, 0x5A, 0x17, + 0x0D, 0x31, 0x37, 0x31, 0x30, 0x32, 0x39, 0x31, 0x35, 0x35, + 0x39, 0x34, 0x36, 0x5A, 0x30, 0x81, 0x90, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C, 0x07, 0x4D, 0x6F, 0x6E, 0x74, 0x61, 0x6E, 0x61, 0x31, 0x10, @@ -1138,41 +1138,41 @@ const unsigned char server_cert_der_2048[] = 0x6F, 0x6D, 0x31, 0x1F, 0x30, 0x1D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, 0x01, 0x16, 0x10, 0x69, 0x6E, 0x66, 0x6F, 0x40, 0x77, 0x6F, 0x6C, 0x66, 0x73, 0x73, - 0x6C, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x09, 0x00, 0x9A, 0x41, - 0x47, 0xCD, 0xA1, 0x14, 0x62, 0x8C, 0x30, 0x0C, 0x06, 0x03, + 0x6C, 0x2E, 0x63, 0x6F, 0x6D, 0x82, 0x09, 0x00, 0xB0, 0x09, + 0x88, 0x5C, 0x39, 0x56, 0xA5, 0x81, 0x30, 0x0C, 0x06, 0x03, 0x55, 0x1D, 0x13, 0x04, 0x05, 0x30, 0x03, 0x01, 0x01, 0xFF, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x05, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, - 0x3D, 0x8C, 0x70, 0x05, 0x5B, 0x62, 0x4B, 0xBF, 0x6C, 0xB6, - 0x48, 0x61, 0x01, 0x10, 0x1D, 0x5E, 0x05, 0xBA, 0x55, 0x94, - 0x2C, 0xAE, 0x59, 0x6F, 0x97, 0x80, 0x5D, 0x6C, 0x86, 0xEC, - 0x9A, 0xEB, 0x15, 0x45, 0x44, 0xE4, 0x56, 0xF8, 0x75, 0xCA, - 0x8A, 0x45, 0x32, 0xF4, 0xC7, 0xE1, 0xFA, 0xF2, 0x98, 0x1C, - 0x91, 0xD3, 0x3F, 0xE8, 0x0E, 0xC9, 0x1B, 0xFA, 0xE1, 0x79, - 0x99, 0x67, 0x0E, 0x0D, 0x6B, 0x8A, 0xEC, 0x1A, 0x2C, 0x59, - 0xC4, 0x34, 0x04, 0x8D, 0x39, 0x77, 0xCD, 0xB5, 0xE9, 0x60, - 0x5B, 0x82, 0xBF, 0x34, 0xCE, 0xED, 0xC6, 0x4F, 0x3F, 0xB4, - 0x5C, 0x4D, 0x8A, 0xB4, 0xF4, 0x0A, 0x04, 0x12, 0xA0, 0x56, - 0xC1, 0xE1, 0x33, 0x37, 0xA1, 0x54, 0x87, 0x48, 0xE9, 0x81, - 0xC2, 0x0F, 0x8F, 0x6F, 0xD3, 0x52, 0x4C, 0x4C, 0x32, 0x4C, - 0x6B, 0x9F, 0x3A, 0x04, 0x8F, 0x77, 0x5D, 0xAD, 0xDC, 0x3D, - 0x2B, 0xF2, 0xC9, 0xDF, 0x3C, 0x60, 0x5D, 0xD8, 0xFC, 0x86, - 0x72, 0x7C, 0x3D, 0xD0, 0x84, 0x4B, 0x8C, 0xDF, 0x26, 0x43, - 0xFE, 0xC0, 0xCC, 0x5B, 0xE1, 0x36, 0xB3, 0x3D, 0x32, 0x28, - 0xA3, 0xEF, 0x0C, 0x20, 0xD6, 0xB1, 0x50, 0x39, 0xD6, 0x67, - 0xA9, 0x8B, 0x84, 0xBC, 0x92, 0x34, 0xEB, 0x19, 0x23, 0xE8, - 0x10, 0x8F, 0xEA, 0xBD, 0x18, 0x8C, 0x93, 0x27, 0x3C, 0x74, - 0x75, 0x8E, 0x58, 0x04, 0xFA, 0x2A, 0x74, 0x44, 0x7D, 0xFC, - 0x4D, 0x39, 0xDF, 0x54, 0x17, 0xBA, 0x78, 0xE1, 0x5D, 0x6A, - 0x70, 0xD3, 0x7C, 0xA2, 0x80, 0x81, 0xE6, 0x19, 0x51, 0x91, - 0xC3, 0x44, 0x51, 0xEC, 0xBB, 0x88, 0xA9, 0x53, 0xE1, 0xD7, - 0xA9, 0x8C, 0x28, 0xF4, 0x21, 0x1C, 0x42, 0x51, 0x09, 0xB4, - 0x12, 0x6D, 0xA0, 0xD6, 0x25, 0x09, 0x85, 0xC6, 0x2A, 0x0C, - 0xAF, 0xA7, 0x58, 0xE6, 0x52, 0x8B + 0x2E, 0xB6, 0x14, 0x23, 0x9F, 0xD2, 0xB6, 0x42, 0xB9, 0x5A, + 0x4B, 0x54, 0x09, 0xD9, 0x44, 0xE6, 0x29, 0x5D, 0x94, 0xE3, + 0xE4, 0xC5, 0xCE, 0x06, 0x41, 0x02, 0xFB, 0x03, 0x6B, 0x44, + 0xA6, 0xA4, 0x85, 0xF3, 0x33, 0x00, 0xC4, 0x29, 0xD8, 0x10, + 0x23, 0xE2, 0xCB, 0x73, 0xDB, 0x02, 0x16, 0x23, 0x23, 0x9B, + 0xF3, 0x2F, 0x7C, 0x02, 0x6B, 0xF3, 0x74, 0x41, 0xD8, 0x96, + 0xD4, 0x27, 0x54, 0xB5, 0x46, 0x25, 0xFE, 0xD3, 0x78, 0xBD, + 0x5E, 0xC8, 0x1F, 0xE2, 0xE1, 0xF3, 0xD1, 0x65, 0xE9, 0x0A, + 0x58, 0xD7, 0xD2, 0x9D, 0xB3, 0x05, 0x2B, 0xF0, 0x29, 0x5C, + 0xB3, 0x0B, 0xF5, 0xBE, 0x02, 0xC0, 0x1A, 0x82, 0xD1, 0x4E, + 0x6B, 0xF6, 0x9B, 0x6B, 0x43, 0xD1, 0xA9, 0x79, 0x3F, 0xF3, + 0x5A, 0xA7, 0x93, 0x4B, 0xA0, 0x0D, 0xE5, 0x75, 0x47, 0xC8, + 0x19, 0x12, 0x58, 0xED, 0x90, 0x59, 0x8B, 0x42, 0x24, 0x4B, + 0x16, 0x66, 0x20, 0x8F, 0x4A, 0xB8, 0xCA, 0x8D, 0x97, 0x97, + 0x12, 0xA7, 0x30, 0x1B, 0x8F, 0x05, 0xAF, 0x0C, 0x18, 0xDD, + 0xBE, 0x3C, 0x03, 0xC2, 0xA3, 0x14, 0x1D, 0x17, 0xDB, 0xFB, + 0xB2, 0x70, 0xB0, 0x21, 0xDB, 0x16, 0x41, 0xEC, 0x45, 0xA3, + 0x4C, 0x42, 0x4F, 0x07, 0xB4, 0x11, 0x9F, 0x9D, 0xBA, 0xD2, + 0xCE, 0x5C, 0xAE, 0xDB, 0x0B, 0xA4, 0xC0, 0x12, 0x94, 0x86, + 0x24, 0xCC, 0x69, 0x8C, 0x53, 0xE6, 0xB0, 0x8A, 0xAC, 0x3D, + 0xC4, 0xEB, 0xEE, 0xDF, 0xE8, 0x46, 0x58, 0xB5, 0xAF, 0x1E, + 0xD5, 0x21, 0x51, 0x27, 0xEF, 0x02, 0x7B, 0xF4, 0x07, 0x05, + 0x10, 0x82, 0x4F, 0xA9, 0x12, 0xCB, 0xD1, 0x5C, 0x5A, 0xB5, + 0x33, 0xBC, 0xEE, 0x72, 0xE0, 0x90, 0x7A, 0xBD, 0x53, 0x3E, + 0xF1, 0x63, 0xEE, 0x0F, 0xA3, 0x54, 0x8C, 0x4A, 0x1E, 0xC4, + 0xF5, 0x6A, 0x2E, 0x07, 0xD1, 0x62 }; const int sizeof_server_cert_der_2048 = sizeof(server_cert_der_2048); #endif /* USE_CERT_BUFFERS_1024 */ -#endif /* WOLFSSL_CERTS_TEST_H */ +#endif /* CYASSL_CERTS_TEST_H */