mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +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
132 lines
3.2 KiB
C
132 lines
3.2 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);
|
|
}
|
|
|
|
void
|
|
print_usage()
|
|
{
|
|
printf("viossl-test: testing SSL virtual IO. Usage:\n");
|
|
printf("viossl-test server-key server-cert client-key client-cert [CAfile] [CApath]\n");
|
|
}
|
|
|
|
int
|
|
main( int argc,
|
|
char** argv)
|
|
{
|
|
char* server_key = 0, *server_cert = 0;
|
|
char* client_key = 0, *client_cert = 0;
|
|
char* ca_file = 0, *ca_path = 0;
|
|
char* cipher=0;
|
|
int child_pid,sv[2];
|
|
struct st_VioSSLAcceptorFd* ssl_acceptor=0;
|
|
struct st_VioSSLConnectorFd* ssl_connector=0;
|
|
Vio* client_vio=0, *server_vio=0;
|
|
MY_INIT(argv[0]);
|
|
DBUG_PROCESS(argv[0]);
|
|
DBUG_PUSH(default_dbug_option);
|
|
|
|
if (argc<5)
|
|
{
|
|
print_usage();
|
|
return 1;
|
|
}
|
|
|
|
server_key = argv[1];
|
|
server_cert = argv[2];
|
|
client_key = argv[3];
|
|
client_cert = argv[4];
|
|
if (argc>5)
|
|
ca_file = argv[5];
|
|
if (argc>6)
|
|
ca_path = argv[6];
|
|
printf("Server key/cert : %s/%s\n", server_key, server_cert);
|
|
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);
|
|
|
|
|
|
if (socketpair(PF_UNIX, SOCK_STREAM, IPPROTO_IP, sv)==-1)
|
|
fatal_error("socketpair");
|
|
|
|
ssl_acceptor = new_VioSSLAcceptorFd(server_key, server_cert, ca_file, ca_path, cipher);
|
|
ssl_connector = new_VioSSLConnectorFd(client_key, client_cert, ca_file, ca_path, cipher);
|
|
|
|
client_vio = (struct st_vio*)my_malloc(sizeof(struct st_vio),MYF(0));
|
|
client_vio->sd = sv[0];
|
|
client_vio->vioblocking(client_vio,0);
|
|
sslconnect(ssl_connector,client_vio,60L);
|
|
server_vio = (struct st_vio*)my_malloc(sizeof(struct st_vio),MYF(0));
|
|
server_vio->sd = sv[1];
|
|
server_vio->vioblocking(client_vio,0);
|
|
sslaccept(ssl_acceptor,server_vio,60L);
|
|
|
|
printf("Socketpair: %d , %d\n", client_vio->sd, server_vio->sd);
|
|
|
|
child_pid = fork();
|
|
if (child_pid==-1) {
|
|
my_free((gptr)ssl_acceptor,MYF(0));
|
|
my_free((gptr)ssl_connector,MYF(0));
|
|
fatal_error("fork");
|
|
}
|
|
if (child_pid==0) {
|
|
//child, therefore, client
|
|
char xbuf[100];
|
|
int r = client_vio->read(client_vio,xbuf, sizeof(xbuf));
|
|
if (r<=0) {
|
|
my_free((gptr)ssl_acceptor,MYF(0));
|
|
my_free((gptr)ssl_connector,MYF(0));
|
|
fatal_error("client:SSL_read");
|
|
}
|
|
xbuf[r] = 0;
|
|
printf("client:got %s\n", xbuf);
|
|
my_free((gptr)client_vio,MYF(0));
|
|
my_free((gptr)ssl_acceptor,MYF(0));
|
|
my_free((gptr)ssl_connector,MYF(0));
|
|
} else {
|
|
const char* s = "Huhuhuh";
|
|
int r = server_vio->write(server_vio,(gptr)s, strlen(s));
|
|
if (r<=0) {
|
|
my_free((gptr)ssl_acceptor,MYF(0));
|
|
my_free((gptr)ssl_connector,MYF(0));
|
|
fatal_error("server:SSL_write");
|
|
}
|
|
my_free((gptr)server_vio,MYF(0));
|
|
my_free((gptr)ssl_acceptor,MYF(0));
|
|
my_free((gptr)ssl_connector,MYF(0));
|
|
}
|
|
return 0;
|
|
}
|
|
#else /* HAVE_OPENSSL */
|
|
|
|
int main() {
|
|
return 0;
|
|
}
|
|
#endif /* HAVE_OPENSSL */
|
|
|