diff options
| author | unknown <tonu@x153.internalnet> | 2001-08-27 03:34:52 +0800 |
|---|---|---|
| committer | unknown <tonu@x153.internalnet> | 2001-08-27 03:34:52 +0800 |
| commit | a1f5a1094a654c37ca7d3a5ee076bfedc16c4584 (patch) | |
| tree | 9788e564a1e5b119ac0c66775e373efcc18bfeca /vio/viosslfactories.c | |
| parent | d853390e56f6ba77d99db3bc37f8f5e372450847 (diff) | |
| download | mariadb-git-a1f5a1094a654c37ca7d3a5ee076bfedc16c4584.tar.gz | |
OpenSSL changes
BitKeeper/etc/ignore:
Added vio/test-sslclient vio/test-sslserver to the ignore list
client/mysql.cc:
Let make mysql client tell user about cipher in use
sql/mini_client.cc:
Synced SSL stuff with libmysql code
sql/mysqld.cc:
Preaparations to turn replication SSL on
Stuff to output SSL variables with SHOW STATUS command
sql/sql_show.cc:
Stuff to output SSL variables with SHOW STATUS command
sql/structs.h:
Stuff to output SSL variables with SHOW STATUS command
vio/viossl.c:
Major modifications
vio/viosslfactories.c:
SSL fixes
Diffstat (limited to 'vio/viosslfactories.c')
| -rw-r--r-- | vio/viosslfactories.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 5285dd0f7b1..d10814417c1 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -55,7 +55,7 @@ static int vio_set_cert_stuff(SSL_CTX *ctx, const char *cert_file, const char *key_file) { DBUG_ENTER("vio_set_cert_stuff"); - DBUG_PRINT("enter", ("ctx=%p, cert_file=%p, key_file=%p", + DBUG_PRINT("enter", ("ctx=%p, cert_file=%s, key_file=%s", ctx, cert_file, key_file)); if (cert_file != NULL) { @@ -170,7 +170,7 @@ struct st_VioSSLConnectorFd* new_VioSSLConnectorFd(const char* key_file, ssl_error_strings_loaded = TRUE; SSL_load_error_strings(); } - ptr->ssl_method_ = SSLv23_client_method(); + ptr->ssl_method_ = TLSv1_client_method(); ptr->ssl_context_ = SSL_CTX_new(ptr->ssl_method_); DBUG_PRINT("info", ("ssl_context_: %p",ptr->ssl_context_)); if (ptr->ssl_context_ == 0) @@ -200,7 +200,7 @@ struct st_VioSSLConnectorFd* new_VioSSLConnectorFd(const char* key_file, report_errors(); goto ctor_failure; } - } + } DBUG_RETURN(ptr); ctor_failure: DBUG_PRINT("exit", ("there was an error")); @@ -246,7 +246,7 @@ new_VioSSLAcceptorFd(const char* key_file, ssl_error_strings_loaded = TRUE; SSL_load_error_strings(); } - ptr->ssl_method_ = SSLv23_server_method(); + ptr->ssl_method_ = TLSv1_server_method(); ptr->ssl_context_ = SSL_CTX_new(ptr->ssl_method_); if (ptr->ssl_context_==0) { |