diff options
| author | tonu@volk.internalnet <> | 2001-09-30 10:46:20 +0800 |
|---|---|---|
| committer | tonu@volk.internalnet <> | 2001-09-30 10:46:20 +0800 |
| commit | 5658ff8237dc6e08e07154ef2a9a7c0ce3e0a453 (patch) | |
| tree | c8e33b443fde74ad722536829cd56fa9403617cd /vio/test-sslserver.c | |
| parent | 5d9be4de24ab02436edbe2c75e96704a31c522b2 (diff) | |
| download | mariadb-git-5658ff8237dc6e08e07154ef2a9a7c0ce3e0a453.tar.gz | |
SSL compiles and works as far as can see. Continue testing..
Diffstat (limited to 'vio/test-sslserver.c')
| -rw-r--r-- | vio/test-sslserver.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vio/test-sslserver.c b/vio/test-sslserver.c index bad141dff17..610a4173875 100644 --- a/vio/test-sslserver.c +++ b/vio/test-sslserver.c @@ -46,7 +46,7 @@ do_ssl_stuff( TH_ARGS* args) /* TCP connection is ready. Do server side SSL. */ err = write(server_vio->sd,(gptr)s, strlen(s)); - sslaccept(args->ssl_acceptor,server_vio); + sslaccept(args->ssl_acceptor,server_vio,60L); err = server_vio->write(server_vio,(gptr)s, strlen(s)); DBUG_VOID_RETURN; } @@ -65,7 +65,8 @@ main( int argc __attribute__((unused)), char server_key[] = "../SSL/server-key.pem", server_cert[] = "../SSL/server-cert.pem"; char ca_file[] = "../SSL/cacert.pem", - *ca_path = 0; + *ca_path = 0, + *cipher = 0; struct st_VioSSLAcceptorFd* ssl_acceptor; pthread_t th; TH_ARGS th_args; @@ -89,7 +90,7 @@ main( int argc __attribute__((unused)), if (ca_path!=0) printf("CApath : %s\n", ca_path); - th_args.ssl_acceptor = ssl_acceptor = new_VioSSLAcceptorFd(server_key, server_cert, ca_file, ca_path); + th_args.ssl_acceptor = ssl_acceptor = new_VioSSLAcceptorFd(server_key, server_cert, ca_file, ca_path,cipher); /* ----------------------------------------------- */ /* Prepare TCP socket for receiving connections */ |