mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 07:14:17 +01:00
d13f2dfdeb
Docs/manual.ja.texi: e-mail address fixed include/mysqld_error.h: Added 3 new errormessages related to SSL mysql-test/install_test_db.sh: SSL fix scripts/mysql_install_db.sh: mysql.user table changes to conform SSL ACL sql/lex.h: Fixed GRANT+SSL clause sql/share/czech/errmsg.txt: Added 3 new errormessages related to SSL sql/share/danish/errmsg.txt: Added 3 new errormessages related to SSL sql/share/dutch/errmsg.txt: Added 3 new errormessages related to SSL sql/share/english/errmsg.txt: Added 3 new errormessages related to SSL sql/share/estonian/errmsg.txt: Added 3 new errormessages related to SSL sql/share/french/errmsg.txt: Added 3 new errormessages related to SSL sql/share/german/errmsg.txt: Added 3 new errormessages related to SSL sql/share/greek/errmsg.txt: Added 3 new errormessages related to SSL sql/share/hungarian/errmsg.txt: Added 3 new errormessages related to SSL sql/share/italian/errmsg.txt: Added 3 new errormessages related to SSL sql/share/japanese/errmsg.txt: Added 3 new errormessages related to SSL sql/share/korean/errmsg.txt: Added 3 new errormessages related to SSL sql/share/norwegian-ny/errmsg.txt: Added 3 new errormessages related to SSL sql/share/norwegian/errmsg.txt: Added 3 new errormessages related to SSL sql/share/polish/errmsg.txt: Added 3 new errormessages related to SSL sql/share/portuguese/errmsg.txt: Added 3 new errormessages related to SSL sql/share/romanian/errmsg.txt: Added 3 new errormessages related to SSL sql/share/russian/errmsg.txt: Added 3 new errormessages related to SSL sql/share/slovak/errmsg.txt: Added 3 new errormessages related to SSL sql/share/spanish/errmsg.txt: Added 3 new errormessages related to SSL sql/share/swedish/errmsg.txt: Added 3 new errormessages related to SSL sql/share/ukrainian/errmsg.txt: Added 3 new errormessages related to SSL Docs/manual.texi: SSL fixes BUILD/compile-pentium-max: SSL was missing here acinclude.m4: typo fix alignment fix client/mysql.cc: SSL fixes client/mysqladmin.c: SSL fixes client/mysqlcheck.c: SSL fixes client/mysqldump.c: SSL fixes client/mysqlimport.c: SSL fixes client/mysqlshow.c: SSL fixes include/mysql.h: SSL fixes include/sslopt-case.h: SSL fixes include/sslopt-longopts.h: SSL fixes include/sslopt-usage.h: SSL fixes include/sslopt-vars.h: SSL fixes include/violite.h: SSL fixes cleanups libmysql/libmysql.c: SSL fixes libmysqld/lib_sql.cc: SSL fixes sql/mini_client.cc: SSL fixes sql/mysqld.cc: SSL fixes cleanup new variables to SHOW STATUS sql/sql_acl.cc: SSL fixes sql/sql_acl.h: SSL fixes sql/sql_lex.h: SSL fixes sql/sql_parse.cc: SSL fixes sql/sql_show.cc: New functions added sql/structs.h: New functions added vio/test-ssl.c: SSL fixes vio/test-sslclient.c: SSL fixes vio/test-sslserver.c: SSL fixes vio/viosocket.c: SSL fixes vio/viossl.c: SSL fixes cleanup vio/viosslfactories.c: SSL fixes sql/sql_yacc.yy: SSL fixes
90 lines
2.3 KiB
C
90 lines
2.3 KiB
C
#include <my_global.h>
|
|
#ifdef HAVE_OPENSSL
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
#include <m_ctype.h>
|
|
#include "mysql.h"
|
|
#include "errmsg.h"
|
|
#include <my_dir.h>
|
|
#ifndef __GNU_LIBRARY__
|
|
#define __GNU_LIBRARY__ // Skip warnings in getopt.h
|
|
#endif
|
|
#include <getopt.h>
|
|
#include <signal.h>
|
|
#include <violite.h>
|
|
|
|
const char *VER="0.1";
|
|
|
|
|
|
#ifndef DBUG_OFF
|
|
const char *default_dbug_option="d:t:O,-";
|
|
#endif
|
|
|
|
void
|
|
fatal_error( const char* r)
|
|
{
|
|
perror(r);
|
|
exit(0);
|
|
}
|
|
|
|
int
|
|
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, *cipher=0;
|
|
struct st_VioSSLConnectorFd* ssl_connector=0;
|
|
struct sockaddr_in sa;
|
|
Vio* client_vio=0;
|
|
int err;
|
|
char xbuf[100]="Ohohhhhoh1234";
|
|
MY_INIT(argv[0]);
|
|
DBUG_PROCESS(argv[0]);
|
|
DBUG_PUSH(default_dbug_option);
|
|
|
|
printf("Client key/cert : %s/%s\n", client_key, client_cert);
|
|
if (ca_file!=0)
|
|
printf("CAfile : %s\n", ca_file);
|
|
if (ca_path!=0)
|
|
printf("CApath : %s\n", ca_path);
|
|
|
|
ssl_connector = new_VioSSLConnectorFd(client_key, client_cert, ca_file, ca_path, cipher);
|
|
if(!ssl_connector) {
|
|
fatal_error("client:new_VioSSLConnectorFd failed");
|
|
}
|
|
|
|
/* ----------------------------------------------- */
|
|
/* Create a socket and connect to server using normal socket calls. */
|
|
|
|
client_vio = vio_new(socket (AF_INET, SOCK_STREAM, 0), VIO_TYPE_TCPIP, TRUE);
|
|
|
|
memset (&sa, '\0', sizeof(sa));
|
|
sa.sin_family = AF_INET;
|
|
sa.sin_addr.s_addr = inet_addr ("127.0.0.1"); /* Server IP */
|
|
sa.sin_port = htons (1111); /* Server Port number */
|
|
|
|
err = connect(client_vio->sd, (struct sockaddr*) &sa,
|
|
sizeof(sa));
|
|
|
|
/* ----------------------------------------------- */
|
|
/* Now we have TCP conncetion. Start SSL negotiation. */
|
|
read(client_vio->sd,xbuf, sizeof(xbuf));
|
|
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));
|
|
fatal_error("client:SSL_read");
|
|
}
|
|
xbuf[err] = 0;
|
|
printf("client:got %s\n", xbuf);
|
|
my_free((gptr)client_vio,MYF(0));
|
|
my_free((gptr)ssl_connector,MYF(0));
|
|
return 0;
|
|
}
|
|
#else /* HAVE_OPENSSL */
|
|
|
|
int main() {
|
|
return 0;
|
|
}
|
|
#endif /* HAVE_OPENSSL */
|
|
|