fix root certificate loading

Author: Tianyi Chen

src/network/peloton_server.cpp

@@ -118,7 +118,7 @@ void PelotonServer::SSLInit() {
   }
   // TODO(Yuchen): change this.
   // load trusted CA certificates (peer authentication)
-  if (SSL_CTX_load_verify_locations(ssl_context, certificate_file_.c_str(),
+  if (SSL_CTX_load_verify_locations(ssl_context, root_cert_file_.c_str(),
                                     nullptr) != 1) {
     LOG_WARN("Exception when loading root_crt!");
     SetSSLLevel(SSLLevel::SSL_PREFER);

test/network/ssl/server.crt

@@ -15,22 +15,3 @@ tAR13jyRsdbGR7C8P7n1KessHi/RBokLZjMkfiPlimWQjMeRsLsQVjf2XGk+ywOO
 KDk43LAUEA+ml12PuRjDVDeTDPrIte6YDM9Dxbr0vXj+NPZ4rVvPM5b+wxnZr7kQ
 2G7oYEHfI5QRpIw5fvVwRoNo0NhLHK6SlAKnzn3i
 -----END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDDzCCAfegAwIBAgIJALnYXsYu6xTqMA0GCSqGSIb3DQEBCwUAMB4xHDAaBgNV
-BAMME3Jvb3QueW91cmRvbWFpbi5jb20wHhcNMTgwMzI3MjAwNTM5WhcNMjgwMzI0
-MjAwNTM5WjAeMRwwGgYDVQQDDBNyb290LnlvdXJkb21haW4uY29tMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+bP/zPanodNjwRT07JHxeXGhUQGdWbgM
-lXa30aYqM3JYsMyumXukNhAI0ErEwX+CkXBsK3/+nuATm18s8FipIWuUeh19Sokh
-qeLaZiSrZEHHjsiLreVsoKI9bAuohPay2XI3hkLEeQ1Mo4yxRjU1BpktY4lhzvvf
-cTE1G/zRtGMAGKeng/S0aadjJbmFxEQB14x68FQg6UsfpukIizmZmgJ5uRnmhDgL
-xiMfYrGjSl+sH9+Pmi5D6jcYIC1P1qcVDB7q1xd+cktrfNCXVo8zaYlDOuAqhPoD
-TpTf0eK9aPXoiFtP30Ys8S3CjQA3ChuxX96oyNOxG87VNGVFRiyvfQIDAQABo1Aw
-TjAdBgNVHQ4EFgQUcHPnzTFlIDQL7qO4hWpr4c3g0fEwHwYDVR0jBBgwFoAUcHPn
-zTFlIDQL7qO4hWpr4c3g0fEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
-AQEA4ghpPKmNeSlFEwkfaqeum9DuvORlhrdBA/l64QlB3VwmeyA2O/bpTGuad3E6
-BsrR2DXH0k4lpoK/uzBGgUas5R0Tg2eiUD/uhHff/thU/yvoCD3o2K0cQXKCTYgq
-ct25OLMNxf2sHN8VD64AJnvF6yIv0ptBkF2Iqcn5486f5pJgs48MhJcSjFZYpjvo
-T54vh+U6DLT0dPIa5JJOhBQIe6LYuJDwZH84Fh3lGKip5OWT1RfuTHKViz5fL+lX
-eQqzL9kA9zm593Z6ltvVdSTxndBW1JYgL9opMB7wrvuEdGUECXzZJWioO9EP/yV2
-ekprwI05kJhh2fqrduTuIq30HQ==
------END CERTIFICATE-----

test/network/ssl_test.cpp

@@ -34,7 +34,6 @@ class SSLTests : public PelotonTest {};
 
 // The following keys and certificates are generated using
 // https://www.postgresql.org/docs/9.5/static/libpq-ssl.html
-// and then concate root.crt right after server.crt
 std::string client_crt = std::string(
     StringUtil::Format("%s%s", SOURCE_FOLDER, "/test/network/ssl/root.crt"));
 std::string client_key = std::string(