1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SHA1 service

Browse Source 
(because mysql_ssl library is built with -fvisibility=hidden)
This commit is contained in:
Sergei Golubchik 2013-07-13 17:48:06 +02:00
parent 36519b8a83
commit 3e9446a742
13 changed files with 136 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mysql/plugin.h
View File

@ -74,7 +74,7 @@ typedef struct st_mysql_xid MYSQL_XID;
#define MYSQL_PLUGIN_INTERFACE_VERSION 0x0104
/* MariaDB plugin interface version */
#define MARIA_PLUGIN_INTERFACE_VERSION 0x0105
#define MARIA_PLUGIN_INTERFACE_VERSION 0x0106
/*
The allowable types of plugins

7
include/mysql/plugin_audit.h.pp
View File

@ -93,6 +93,13 @@ extern struct kill_statement_service_st {
enum thd_kill_levels (*thd_kill_level_func)(const void*);
} *thd_kill_statement_service;
enum thd_kill_levels thd_kill_level(const void*);
#include <mysql/service_sha1.h>
extern struct my_sha1_service_st {
void (*my_sha1_type)(unsigned char*, const char*, size_t);
void (*my_sha1_multi_type)(unsigned char*, ...);
} *my_sha1_service;
void my_sha1(unsigned char*, const char*, size_t);
void my_sha1_multi(unsigned char*, ...);
struct st_mysql_xid {
long formatID;
long gtrid_length;

7
include/mysql/plugin_auth.h.pp
View File

@ -93,6 +93,13 @@ extern struct kill_statement_service_st {
enum thd_kill_levels (*thd_kill_level_func)(const void*);
} *thd_kill_statement_service;
enum thd_kill_levels thd_kill_level(const void*);
#include <mysql/service_sha1.h>
extern struct my_sha1_service_st {
void (*my_sha1_type)(unsigned char*, const char*, size_t);
void (*my_sha1_multi_type)(unsigned char*, ...);
} *my_sha1_service;
void my_sha1(unsigned char*, const char*, size_t);
void my_sha1_multi(unsigned char*, ...);
struct st_mysql_xid {
long formatID;
long gtrid_length;

7
include/mysql/plugin_ftparser.h.pp
View File

@ -93,6 +93,13 @@ extern struct kill_statement_service_st {
enum thd_kill_levels (*thd_kill_level_func)(const void*);
} *thd_kill_statement_service;
enum thd_kill_levels thd_kill_level(const void*);
#include <mysql/service_sha1.h>
extern struct my_sha1_service_st {
void (*my_sha1_type)(unsigned char*, const char*, size_t);
void (*my_sha1_multi_type)(unsigned char*, ...);
} *my_sha1_service;
void my_sha1(unsigned char*, const char*, size_t);
void my_sha1_multi(unsigned char*, ...);
struct st_mysql_xid {
long formatID;
long gtrid_length;

57
include/mysql/service_sha1.h Normal file
View File

@ -0,0 +1,57 @@
#ifndef MYSQL_SERVICE_SHA1_INCLUDED
/* Copyright (c) 2013, Monty Program Ab
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
/**
@file
my sha1 service
Functions to calculate SHA1 hash from a memory buffer
*/
#ifdef __cplusplus
extern "C" {
#endif
#ifndef MYSQL_ABI_CHECK
#include <stdlib.h>
#endif
#define MY_SHA1_HASH_SIZE 20 /* Hash size in bytes */
extern struct my_sha1_service_st {
void (*my_sha1_type)(unsigned char*, const char*, size_t);
void (*my_sha1_multi_type)(unsigned char*, ...);
} *my_sha1_service;
#ifdef MYSQL_DYNAMIC_PLUGIN
#define my_sha1(A,B,C) my_sha1_service->my_sha1_type(A,B,C)
#define my_sha1_multi my_sha1_service->my_sha1_multi_type
#else
void my_sha1(unsigned char*, const char*, size_t);
void my_sha1_multi(unsigned char*, ...);
#endif
#ifdef __cplusplus
}
#endif
#define MYSQL_SERVICE_SHA1_INCLUDED
#endif

1
include/mysql/services.h
View File

@ -25,6 +25,7 @@ extern "C" {
#include <mysql/service_progress_report.h>
#include <mysql/service_debug_sync.h>
#include <mysql/service_kill_statement.h>
#include <mysql/service_sha1.h>
#ifdef __cplusplus
}

6
include/service_versions.h
View File

@ -19,11 +19,13 @@
#define SERVICE_VERSION void *
#endif
#define VERSION_debug_sync 0x1000
#define VERSION_kill_statement 0x1000
#define VERSION_my_snprintf 0x0100
#define VERSION_thd_alloc 0x0100
#define VERSION_thd_wait 0x0100
#define VERSION_my_thread_scheduler 0x0100
#define VERSION_progress_report 0x0100
#define VERSION_debug_sync 0x1000
#define VERSION_kill_statement 0x1000
#define VERSION_my_sha1 0x0100

15
include/sha1.h
View File

@ -1,8 +1,7 @@
#ifndef SHA1_INCLUDED
#define SHA1_INCLUDED
/* Copyright (c) 2002, 2006 MySQL AB, 2009 Sun Microsystems, Inc.
Use is subject to license terms.
/* Copyright (c) 2013, Monty Program Ab
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -18,13 +17,9 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define SHA1_HASH_SIZE 20 /* Hash size in bytes */
C_MODE_START
void compute_sha1_hash(uint8 *digest, const char *buf, int len);
void compute_sha1_hash_multi(uint8 *digest, const char *buf1, int len1,
const char *buf2, int len2);
C_MODE_END
#include <mysql/service_sha1.h>
#define SHA1_HASH_SIZE MY_SHA1_HASH_SIZE
#define compute_sha1_hash(A,B,C) my_sha1(A,B,C)
#define compute_sha1_hash_multi(A,B,C,D,E) my_sha1_multi(A,B,C,D,E,NULL)
#endif /* SHA__INCLUDED */

1
libservices/CMakeLists.txt
View File

@ -22,6 +22,7 @@ SET(MYSQLSERVICES_SOURCES
my_thread_scheduler_service.c
progress_report_service.c
debug_sync_service.c
my_sha1_service.c
kill_statement_service.c)
ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})

2
libservices/HOWTO
View File

@ -76,7 +76,7 @@ it should also declare all the accompanying data structures, as necessary
==================================================================
/* GPL header */
#include <service_versions.h>
SERVICE_VERSION *foo_service= (void*)VERSION_foo;
SERVICE_VERSION foo_service= (void*)VERSION_foo;
==================================================================
7. add the new file to libservices/CMakeLists.txt (MYSQLSERVICES_SOURCES)

18
libservices/my_sha1_service.c Normal file
View File

@ -0,0 +1,18 @@
/* Copyright (c) 2013 Monty Program Ab
Use is subject to license terms.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
#include <service_versions.h>
SERVICE_VERSION my_sha1_service= (void*)VERSION_my_sha1;

30
mysys_ssl/my_sha1.cc
View File

@ -24,6 +24,7 @@
#include <my_global.h>
#include <sha1.h>
#include <stdarg.h>
#if defined(HAVE_YASSL)
#include "sha.hpp"
@ -56,12 +57,15 @@ void mysql_sha1_yassl(uint8 *digest, const char *buf, int len)
@return void
*/
void mysql_sha1_multi_yassl(uint8 *digest, const char *buf1, int len1,
const char *buf2, int len2)
void mysql_sha1_multi_yassl(uint8 *digest, va_list args)
{
const char *str;
TaoCrypt::SHA hasher;
hasher.Update((const TaoCrypt::byte *) buf1, len1);
hasher.Update((const TaoCrypt::byte *) buf2, len2);
for (str= va_arg(args, const char*); str; str= va_arg(args, const char*))
{
hasher.Update((const TaoCrypt::byte *) str, va_arg(args, size_t));
}
hasher.Final((TaoCrypt::byte *) digest);
}
@ -98,7 +102,7 @@ int mysql_sha1_result(SHA_CTX *context,
@return void
*/
void compute_sha1_hash(uint8 *digest, const char *buf, int len)
void my_sha1(uint8 *digest, const char *buf, size_t len)
{
#if defined(HAVE_YASSL)
mysql_sha1_yassl(digest, buf, len);
@ -124,18 +128,24 @@ void compute_sha1_hash(uint8 *digest, const char *buf, int len)
@return void
*/
void compute_sha1_hash_multi(uint8 *digest, const char *buf1, int len1,
const char *buf2, int len2)
void my_sha1_multi(uint8 *digest, ...)
{
va_list args;
va_start(args, digest);
#if defined(HAVE_YASSL)
mysql_sha1_multi_yassl(digest, buf1, len1, buf2, len2);
mysql_sha1_multi_yassl(digest, args);
#elif defined(HAVE_OPENSSL)
SHA_CTX sha1_context;
const char *str;
mysql_sha1_reset(&sha1_context);
mysql_sha1_input(&sha1_context, (const uint8 *) buf1, len1);
mysql_sha1_input(&sha1_context, (const uint8 *) buf2, len2);
for (str= va_arg(args, const char*); str; str= va_arg(args, const char*))
{
mysql_sha1_input(&sha1_context, (const uint8 *) str, va_arg(args, size_t));
}
mysql_sha1_result(&sha1_context, digest);
#endif /* HAVE_YASSL */
va_end(args);
}

8
sql/sql_plugin_services.h
View File

@ -58,6 +58,11 @@ static struct kill_statement_service_st thd_kill_statement_handler= {
thd_kill_level
};
static struct my_sha1_service_st my_sha1_handler = {
my_sha1,
my_sha1_multi
};
static struct st_service_ref list_of_services[]=
{
{ "my_snprintf_service", VERSION_my_snprintf, &my_snprintf_handler },
@ -66,6 +71,7 @@ static struct st_service_ref list_of_services[]=
{ "my_thread_scheduler_service", VERSION_my_thread_scheduler, &my_thread_scheduler_handler },
{ "progress_report_service", VERSION_progress_report, &progress_report_handler },
{ "debug_sync_service", VERSION_debug_sync, 0 }, // updated in plugin_init()
{ "thd_kill_statement_service", VERSION_kill_statement, &thd_kill_statement_handler }
{ "thd_kill_statement_service", VERSION_kill_statement, &thd_kill_statement_handler },
{ "my_sha1_service", VERSION_my_sha1, &my_sha1_handler}
};