Simplified code

This commit is contained in:
yhirose 2019-06-11 21:18:45 -04:00
parent 07d9843b91
commit 8d12e0d8f4
3 changed files with 32 additions and 35 deletions

View file

@ -6,9 +6,9 @@
#define SERVER_PRIVATE_KEY_FILE "./key.pem"
#define CA_CERT_FILE "./ca-bundle.crt"
#define CLIENT_CA_CERT_FILE "./rootCA.cert.pem"
#define CLIENT_CA_CERT_DIR "."
#define CLIENT_CERT_FILE "./client.cert.pem"
#define CLIENT_PRIVATE_KEY_FILE "./client.key.pem"
#define TRUST_CERT_DIR "."
#ifdef _WIN32
#include <process.h>
@ -1381,7 +1381,7 @@ TEST(SSLClientTest, WildcardHostNameMatch) {
TEST(SSLClientServerTest, ClientCertPresent) {
SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE,
TRUST_CERT_DIR);
CLIENT_CA_CERT_DIR);
ASSERT_TRUE(svr.is_valid());
svr.Get("/test", [&](const Request &, Response &res) {
@ -1402,7 +1402,7 @@ TEST(SSLClientServerTest, ClientCertPresent) {
TEST(SSLClientServerTest, ClientCertMissing) {
SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE, CLIENT_CA_CERT_FILE,
TRUST_CERT_DIR);
CLIENT_CA_CERT_DIR);
ASSERT_TRUE(svr.is_valid());
svr.Get("/test", [&](const Request &, Response &res) {
@ -1444,7 +1444,7 @@ TEST(SSLClientServerTest, TrustDirOptional) {
/* Cannot test this case as there is no external access to SSL object to check
SSL_get_peer_certificate() == NULL TEST(SSLClientServerTest,
ClientCAPathRequired) { SSLServer svr(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE,
nullptr, TRUST_CERT_DIR);
nullptr, CLIENT_CA_CERT_DIR);
}
*/
#endif