From 3889c1e05bb24d6ee2bdbf2b7259765bb477dd93 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 9 Jun 2005 15:46:33 +0200 Subject: [PATCH] mysql_test_run_new.c: Corrected path to SSL certificate files mysql-test/mysql_test_run_new.c: Corrected path to SSL certificate files --- mysql-test/mysql_test_run_new.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/mysql-test/mysql_test_run_new.c b/mysql-test/mysql_test_run_new.c index 41cd4706e0b..b8e7f1ba2b7 100644 --- a/mysql-test/mysql_test_run_new.c +++ b/mysql-test/mysql_test_run_new.c @@ -1345,11 +1345,11 @@ void setup(char *file __attribute__((unused))) #endif /* HAVE_OPENSSL */ /* OpenSSL paths */ - snprintf(ca_cert, FN_REFLEN, "%s/SSL/cacert.pem", base_dir); - snprintf(server_cert, FN_REFLEN, "%s/SSL/server-cert.pem", base_dir); - snprintf(server_key, FN_REFLEN, "%s/SSL/server-key.pem", base_dir); - snprintf(client_cert, FN_REFLEN, "%s/SSL/client-cert.pem", base_dir); - snprintf(client_key, FN_REFLEN, "%s/SSL/client-key.pem", base_dir); + snprintf(ca_cert, FN_REFLEN, "%s/std_data/cacert.pem", mysql_test_dir); + snprintf(server_cert, FN_REFLEN, "%s/std_data/server-cert.pem", mysql_test_dir); + snprintf(server_key, FN_REFLEN, "%s/std_data/server-key.pem", mysql_test_dir); + snprintf(client_cert, FN_REFLEN, "%s/std_data/client-cert.pem", mysql_test_dir); + snprintf(client_key, FN_REFLEN, "%s/std_data/client-key.pem", mysql_test_dir); /* setup files */ snprintf(mysqld_file, FN_REFLEN, "%s/mysqld", bin_dir); @@ -1378,11 +1378,11 @@ void setup(char *file __attribute__((unused))) #endif /* HAVE_OPENSSL */ /* OpenSSL paths */ - snprintf(ca_cert, FN_REFLEN, "%s/SSL/cacert.pem", base_dir); - snprintf(server_cert, FN_REFLEN, "%s/SSL/server-cert.pem", base_dir); - snprintf(server_key, FN_REFLEN, "%s/SSL/server-key.pem", base_dir); - snprintf(client_cert, FN_REFLEN, "%s/SSL/client-cert.pem", base_dir); - snprintf(client_key, FN_REFLEN, "%s/SSL/client-key.pem", base_dir); + snprintf(ca_cert, FN_REFLEN, "%s/std_data/cacert.pem", mysql_test_dir); + snprintf(server_cert, FN_REFLEN, "%s/std_data/server-cert.pem", mysql_test_dir); + snprintf(server_key, FN_REFLEN, "%s/std_data/server-key.pem", mysql_test_dir); + snprintf(client_cert, FN_REFLEN, "%s/std_data/client-cert.pem", mysql_test_dir); + snprintf(client_key, FN_REFLEN, "%s/std_data/client-key.pem", mysql_test_dir); /* setup files */ #ifdef _DEBUG @@ -1411,11 +1411,11 @@ void setup(char *file __attribute__((unused))) #endif /* HAVE_OPENSSL */ /* OpenSSL paths */ - snprintf(ca_cert, FN_REFLEN, "%s/SSL/cacert.pem", base_dir); - snprintf(server_cert, FN_REFLEN, "%s/SSL/server-cert.pem", base_dir); - snprintf(server_key, FN_REFLEN, "%s/SSL/server-key.pem", base_dir); - snprintf(client_cert, FN_REFLEN, "%s/SSL/client-cert.pem", base_dir); - snprintf(client_key, FN_REFLEN, "%s/SSL/client-key.pem", base_dir); + snprintf(ca_cert, FN_REFLEN, "%s/std_data/cacert.pem", mysql_test_dir); + snprintf(server_cert, FN_REFLEN, "%s/std_data/server-cert.pem", mysql_test_dir); + snprintf(server_key, FN_REFLEN, "%s/std_data/server-key.pem", mysql_test_dir); + snprintf(client_cert, FN_REFLEN, "%s/std_data/client-cert.pem", mysql_test_dir); + snprintf(client_key, FN_REFLEN, "%s/std_data/client-key.pem", mysql_test_dir); /* setup files */ snprintf(mysqld_file, FN_REFLEN, "%s/sql/mysqld", base_dir);