summaryrefslogtreecommitdiff
path: root/vio/test-sslclient.c
diff options
context:
space:
mode:
authortonu@volk.internalnet <>2001-09-30 10:46:20 +0800
committertonu@volk.internalnet <>2001-09-30 10:46:20 +0800
commit5658ff8237dc6e08e07154ef2a9a7c0ce3e0a453 (patch)
treec8e33b443fde74ad722536829cd56fa9403617cd /vio/test-sslclient.c
parent5d9be4de24ab02436edbe2c75e96704a31c522b2 (diff)
downloadmariadb-git-5658ff8237dc6e08e07154ef2a9a7c0ce3e0a453.tar.gz
SSL compiles and works as far as can see. Continue testing..
Diffstat (limited to 'vio/test-sslclient.c')
-rw-r--r--vio/test-sslclient.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/vio/test-sslclient.c b/vio/test-sslclient.c
index c19a3589009..b50b0722b17 100644
--- a/vio/test-sslclient.c
+++ b/vio/test-sslclient.c
@@ -32,7 +32,7 @@ main( int argc __attribute__((unused)),
char** argv)
{
char client_key[] = "../SSL/client-key.pem", client_cert[] = "../SSL/client-cert.pem";
- char ca_file[] = "../SSL/cacert.pem", *ca_path = 0;
+ char ca_file[] = "../SSL/cacert.pem", *ca_path = 0, *cipher=0;
struct st_VioSSLConnectorFd* ssl_connector=0;
struct sockaddr_in sa;
Vio* client_vio=0;
@@ -48,7 +48,7 @@ main( int argc __attribute__((unused)),
if (ca_path!=0)
printf("CApath : %s\n", ca_path);
- ssl_connector = new_VioSSLConnectorFd(client_key, client_cert, ca_file, ca_path);
+ ssl_connector = new_VioSSLConnectorFd(client_key, client_cert, ca_file, ca_path, cipher);
if(!ssl_connector) {
fatal_error("client:new_VioSSLConnectorFd failed");
}
@@ -69,7 +69,7 @@ main( int argc __attribute__((unused)),
/* ----------------------------------------------- */
/* Now we have TCP conncetion. Start SSL negotiation. */
read(client_vio->sd,xbuf, sizeof(xbuf));
- sslconnect(ssl_connector,client_vio);
+ sslconnect(ssl_connector,client_vio,60L);
err = client_vio->read(client_vio,xbuf, sizeof(xbuf));
if (err<=0) {
my_free((gptr)ssl_connector,MYF(0));