From d4c25f24f743acafe0a4b1787f7f5540375d16d1 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Tue, 4 May 2021 10:20:11 -0600 Subject: [PATCH] Implement peer review feedback --- pk/test_cert_and_private_keypair/server.cert | 133 ------------------ pk/test_cert_and_private_keypair/server.key | 51 ------- .../test-cert-privkey-pair.c | 27 ++-- 3 files changed, 15 insertions(+), 196 deletions(-) delete mode 100644 pk/test_cert_and_private_keypair/server.cert delete mode 100644 pk/test_cert_and_private_keypair/server.key diff --git a/pk/test_cert_and_private_keypair/server.cert b/pk/test_cert_and_private_keypair/server.cert deleted file mode 100644 index 84ede548..00000000 --- a/pk/test_cert_and_private_keypair/server.cert +++ /dev/null @@ -1,133 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: - 08:23:7f:d2:d2:23:3e:0f:cc:55:94:25:1f:51:7b:e7:cc:3f:4c:af - Signature Algorithm: sha256WithRSAEncryption - Issuer: C = US, ST = Montana, L = Bozeman, O = wolfSSL_4096, OU = Programming-4096, CN = www.wolfssl.com, emailAddress = info@wolfssl.com - Validity - Not Before: May 7 07:39:04 2020 GMT - Not After : Feb 1 07:39:04 2023 GMT - Subject: C = US, ST = Montana, L = Bozeman, O = wolfSSL_4096, OU = Programming-4096, CN = www.wolfssl.com, emailAddress = info@wolfssl.com - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) - Modulus: - 00:f5:d0:31:e4:71:59:58:b3:07:50:dd:16:79:fc: - c6:95:50:fc:46:0e:57:12:86:71:8d:e3:9b:4a:33: - ea:4f:d9:17:13:6d:48:69:df:59:11:08:02:9d:af: - 2b:c7:30:be:0c:dc:87:d4:5a:12:09:23:5d:e1:76: - 5a:62:37:46:74:ef:03:05:bb:1e:6d:29:75:6c:2e: - 9d:87:0d:8f:87:cb:14:95:9b:be:17:6b:51:d1:4c: - da:d7:91:66:c5:36:eb:e0:07:1a:76:4d:b0:fb:c1: - f5:5e:05:db:ba:cb:25:d9:99:13:1c:c0:35:dc:40: - e9:36:cd:c4:d5:7a:41:70:0f:36:eb:a5:4e:17:05: - d5:75:1b:64:62:7a:3f:0d:28:48:6a:e3:ac:9c:a8: - 8f:e9:ed:f7:cd:24:a0:b1:a0:03:ac:e3:03:f5:3f: - d1:96:ff:2a:7e:08:b1:d3:e0:18:14:ec:65:37:50: - 43:c2:6a:8c:f4:5b:fe:c4:cb:8d:3f:81:02:f7:c2: - dd:e4:c1:8e:80:0c:04:25:2d:80:5a:2e:0f:22:35: - 4a:f4:85:ed:51:d8:ab:6d:8f:a2:3b:24:00:6e:81: - e2:1e:76:d6:ac:31:12:db:f3:8e:07:a1:de:89:4a: - 39:60:77:c5:aa:f1:51:e6:06:f1:95:56:2a:e1:8e: - 92:30:9f:fe:58:44:ac:46:f2:fd:9a:fc:a8:1d:a1: - d3:55:37:4a:8b:fc:9c:33:f8:a7:61:48:41:7c:9c: - 77:3f:f5:80:23:7d:43:b4:d5:88:0a:c9:75:d7:44: - 19:4d:77:6c:0b:0a:49:aa:1c:2f:d6:5a:44:a6:47: - 4d:e5:36:96:40:99:2c:56:26:b1:f2:92:31:59:d7: - 2c:d4:b4:21:d6:65:13:0b:3e:fb:ff:04:eb:b9:85: - b9:d8:d8:28:4f:5c:17:96:a3:51:be:fe:7d:0b:1b: - 48:40:25:76:94:dc:41:fb:bf:73:76:da:eb:b3:62: - e7:c1:c8:54:6a:93:e1:8d:31:e8:3e:3e:df:bc:87: - 02:30:22:57:c4:e0:18:7a:d3:ae:e4:02:9b:aa:bd: - 4e:49:47:72:e9:8d:13:2d:54:9b:00:a7:91:61:71: - c9:cc:48:4f:ee:df:5e:1b:1a:df:67:d3:20:e6:44: - 45:98:7e:e7:0e:63:16:83:c9:26:5d:90:c1:e5:2a: - 5c:45:54:13:b2:81:18:06:20:2e:2e:66:5a:b5:7b: - 6e:d6:0c:4e:89:01:56:70:bb:ae:de:e9:99:5e:d1: - b9:3a:b7:6c:17:b6:03:a9:08:dd:9c:f4:14:c9:c9: - 59:39:72:d4:7e:02:37:31:cd:0e:a7:3d:f8:f2:cf: - 6b:15:ab - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Subject Key Identifier: - FA:54:89:67:E5:5F:B7:31:40:EA:FD:E7:F6:A3:C6:5A:56:16:A5:6E - X509v3 Authority Key Identifier: - keyid:FA:54:89:67:E5:5F:B7:31:40:EA:FD:E7:F6:A3:C6:5A:56:16:A5:6E - DirName:/C=US/ST=Montana/L=Bozeman/O=wolfSSL_4096/OU=Programming-4096/CN=www.wolfssl.com/emailAddress=info@wolfssl.com - serial:08:23:7F:D2:D2:23:3E:0F:CC:55:94:25:1F:51:7B:E7:CC:3F:4C:AF - - X509v3 Basic Constraints: - CA:TRUE - X509v3 Subject Alternative Name: - DNS:example.com, IP Address:127.0.0.1 - Signature Algorithm: sha256WithRSAEncryption - 99:e7:e8:6b:6a:c9:27:93:e8:d0:fd:cc:82:54:17:a8:0b:6d: - 10:58:63:07:35:ba:1c:42:b2:fd:4d:f3:98:3f:86:ad:45:ec: - 5c:eb:de:90:00:7a:3e:93:b0:8f:a8:06:62:25:91:79:a0:14: - 47:c8:1e:87:35:98:1f:41:95:e7:68:61:e7:fc:ad:1a:dc:34: - 0a:12:d2:8d:58:22:f6:bb:6f:cf:1a:55:ff:76:28:3c:a1:e9: - 6a:ea:3e:d0:1b:88:f9:7f:4e:59:a5:86:6f:18:a1:ac:e0:87: - f4:ee:12:f3:cd:79:2a:dd:b1:9f:4d:01:74:59:9f:0e:b0:f8: - eb:22:2a:1f:6c:10:1c:0a:32:d6:d4:c1:f5:a2:fe:50:0a:4c: - 4a:34:1c:5f:66:ab:58:ec:e4:df:ab:e8:57:32:b7:a2:7a:a1: - 89:f4:18:6a:47:fd:09:4a:d2:7a:77:26:1b:89:b7:51:44:7b: - 1f:ee:41:45:c1:7b:c0:d0:ab:c5:56:90:97:d3:8c:ed:e6:a7: - e6:e6:7b:58:79:65:a3:13:2c:f0:90:de:77:09:a2:37:f0:d1: - c7:b8:60:69:b0:bd:76:de:7f:d1:7a:a3:fc:5e:da:06:b3:0a: - cf:de:9a:63:7e:67:79:e3:d9:c5:98:ab:9b:23:2d:d5:0d:e4: - d4:1a:e3:16:75:27:ea:ca:46:9d:fa:2d:27:f6:25:b4:5f:a3: - 4f:10:9a:80:25:9b:e3:03:a9:e3:ca:a5:e0:86:61:9e:bf:b8: - 69:03:3b:1d:ba:bf:05:8f:96:78:71:fa:1f:dd:ea:be:53:a9: - 6a:1c:f9:f3:6c:38:7c:59:42:a6:3a:fa:47:d5:d2:33:c7:f3: - 60:ce:b3:2a:ab:b8:d4:38:17:8c:b4:cc:b5:5a:77:22:e4:0b: - b6:09:48:e9:fc:0e:96:b5:2b:28:6d:90:9a:51:a8:09:cf:74: - 35:3a:f7:f5:85:72:1e:a6:d3:4a:2c:a0:4c:30:3b:43:63:e6: - e6:11:af:48:b5:0b:17:e4:f7:1a:23:82:19:5e:b3:cd:fa:49: - 2f:fc:ab:4a:13:12:5b:91:0a:a5:12:a2:df:61:a1:d0:a7:5a: - 46:1f:b9:16:90:96:f4:86:7f:de:b4:6a:e4:cc:63:06:31:f2: - 1c:c2:ba:5a:80:c7:ff:a9:01:ec:0f:26:44:69:4b:c3:a6:90: - 25:e4:78:6d:91:3c:22:ac:48:25:1f:92:97:1d:aa:d2:24:60: - bf:3b:e2:35:9d:04:8f:f9:81:36:f5:ef:0e:57:8c:92:bc:0f: - 3a:2a:3f:8b:81:1c:55:13:26:e1:1e:85:7f:34:c9:1e:7f:71: - 62:17:6d:8d:83:4e:6e:61 ------BEGIN CERTIFICATE----- -MIIG/jCCBOagAwIBAgIUCCN/0tIjPg/MVZQlH1F758w/TK8wDQYJKoZIhvcNAQEL -BQAwgZ4xCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5hMRAwDgYDVQQHDAdC -b3plbWFuMRUwEwYDVQQKDAx3b2xmU1NMXzQwOTYxGTAXBgNVBAsMEFByb2dyYW1t -aW5nLTQwOTYxGDAWBgNVBAMMD3d3dy53b2xmc3NsLmNvbTEfMB0GCSqGSIb3DQEJ -ARYQaW5mb0B3b2xmc3NsLmNvbTAeFw0yMDA1MDcwNzM5MDRaFw0yMzAyMDEwNzM5 -MDRaMIGeMQswCQYDVQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwH -Qm96ZW1hbjEVMBMGA1UECgwMd29sZlNTTF80MDk2MRkwFwYDVQQLDBBQcm9ncmFt -bWluZy00MDk2MRgwFgYDVQQDDA93d3cud29sZnNzbC5jb20xHzAdBgkqhkiG9w0B -CQEWEGluZm9Ad29sZnNzbC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK -AoICAQD10DHkcVlYswdQ3RZ5/MaVUPxGDlcShnGN45tKM+pP2RcTbUhp31kRCAKd -ryvHML4M3IfUWhIJI13hdlpiN0Z07wMFux5tKXVsLp2HDY+HyxSVm74Xa1HRTNrX -kWbFNuvgBxp2TbD7wfVeBdu6yyXZmRMcwDXcQOk2zcTVekFwDzbrpU4XBdV1G2Ri -ej8NKEhq46ycqI/p7ffNJKCxoAOs4wP1P9GW/yp+CLHT4BgU7GU3UEPCaoz0W/7E -y40/gQL3wt3kwY6ADAQlLYBaLg8iNUr0he1R2Kttj6I7JABugeIedtasMRLb844H -od6JSjlgd8Wq8VHmBvGVVirhjpIwn/5YRKxG8v2a/KgdodNVN0qL/Jwz+KdhSEF8 -nHc/9YAjfUO01YgKyXXXRBlNd2wLCkmqHC/WWkSmR03lNpZAmSxWJrHykjFZ1yzU -tCHWZRMLPvv/BOu5hbnY2ChPXBeWo1G+/n0LG0hAJXaU3EH7v3N22uuzYufByFRq -k+GNMeg+Pt+8hwIwIlfE4Bh6067kApuqvU5JR3LpjRMtVJsAp5FhccnMSE/u314b -Gt9n0yDmREWYfucOYxaDySZdkMHlKlxFVBOygRgGIC4uZlq1e27WDE6JAVZwu67e -6Zle0bk6t2wXtgOpCN2c9BTJyVk5ctR+AjcxzQ6nPfjyz2sVqwIDAQABo4IBMDCC -ASwwHQYDVR0OBBYEFPpUiWflX7cxQOr95/ajxlpWFqVuMIHeBgNVHSMEgdYwgdOA -FPpUiWflX7cxQOr95/ajxlpWFqVuoYGkpIGhMIGeMQswCQYDVQQGEwJVUzEQMA4G -A1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjEVMBMGA1UECgwMd29sZlNT -TF80MDk2MRkwFwYDVQQLDBBQcm9ncmFtbWluZy00MDk2MRgwFgYDVQQDDA93d3cu -d29sZnNzbC5jb20xHzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb22CFAgj -f9LSIz4PzFWUJR9Re+fMP0yvMAwGA1UdEwQFMAMBAf8wHAYDVR0RBBUwE4ILZXhh -bXBsZS5jb22HBH8AAAEwDQYJKoZIhvcNAQELBQADggIBAJnn6GtqySeT6ND9zIJU -F6gLbRBYYwc1uhxCsv1N85g/hq1F7Fzr3pAAej6TsI+oBmIlkXmgFEfIHoc1mB9B -ledoYef8rRrcNAoS0o1YIva7b88aVf92KDyh6WrqPtAbiPl/Tlmlhm8Yoazgh/Tu -EvPNeSrdsZ9NAXRZnw6w+OsiKh9sEBwKMtbUwfWi/lAKTEo0HF9mq1js5N+r6Fcy -t6J6oYn0GGpH/QlK0np3JhuJt1FEex/uQUXBe8DQq8VWkJfTjO3mp+bme1h5ZaMT -LPCQ3ncJojfw0ce4YGmwvXbef9F6o/xe2gazCs/emmN+Z3nj2cWYq5sjLdUN5NQa -4xZ1J+rKRp36LSf2JbRfo08QmoAlm+MDqePKpeCGYZ6/uGkDOx26vwWPlnhx+h/d -6r5TqWoc+fNsOHxZQqY6+kfV0jPH82DOsyqruNQ4F4y0zLVadyLkC7YJSOn8Dpa1 -KyhtkJpRqAnPdDU69/WFch6m00osoEwwO0Nj5uYRr0i1Cxfk9xojghles836SS/8 -q0oTEluRCqUSot9hodCnWkYfuRaQlvSGf960auTMYwYx8hzCulqAx/+pAewPJkRp -S8OmkCXkeG2RPCKsSCUfkpcdqtIkYL874jWdBI/5gTb17w5XjJK8DzoqP4uBHFUT -JuEehX80yR5/cWIXbY2DTm5h ------END CERTIFICATE----- diff --git a/pk/test_cert_and_private_keypair/server.key b/pk/test_cert_and_private_keypair/server.key deleted file mode 100644 index cbe8090b..00000000 --- a/pk/test_cert_and_private_keypair/server.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- diff --git a/pk/test_cert_and_private_keypair/test-cert-privkey-pair.c b/pk/test_cert_and_private_keypair/test-cert-privkey-pair.c index feedfaf2..862f63de 100644 --- a/pk/test_cert_and_private_keypair/test-cert-privkey-pair.c +++ b/pk/test_cert_and_private_keypair/test-cert-privkey-pair.c @@ -32,12 +32,15 @@ #include #include +#define LARGEST_FILE_PATH 1024 + +void Usage(void); int main(int argc, char** argv) { WOLFSSL_CTX* ctx; int ret; - char serverKeyFile[] = "./server.key"; - char serverCertFile[] = "./server.cert"; + char serverKeyFile[LARGEST_FILE_PATH] = {0}; + char serverCertFile[LARGEST_FILE_PATH] = {0}; char* svrKeyFile = serverKeyFile; char* svrCertFile = serverCertFile; @@ -47,17 +50,8 @@ int main(int argc, char** argv) svrKeyFile = argv[1]; svrCertFile = argv[2]; } else { - #if defined(FP_MAX_BITS) && (FP_MAX_BITS >= 8192) && \ - defined(USE_FAST_MATH) - printf("\nUsing defaults server.key and server.cert\n"); - printf("To test other key/cert pair run with:\n"); - printf("./test-cert-privkey-pair yourkey.pem yourcert.pem\n\n\n"); - #else - printf("FP_MAX_BITS set too low to run the default 4096-bit pair\n"); - printf("Please build with FP_MAX_BITS set to 8192 or greater when\n" - "using fastmath to test the defaults\n"); + Usage(); return -1; - #endif } ctx = wolfSSL_CTX_new(wolfSSLv23_server_method()); @@ -94,3 +88,12 @@ cleanup: ret = 0; return ret; } + +void Usage(void) +{ + printf("Please specify a cert and key to check\n"); + printf("Example: ./test-cert-privkey-pair ../../certs/server-key.pem " + "../../certs/server-cert.pem\n"); +} + +