diff options
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/md5_compute.cc | 68 | ||||
| -rw-r--r-- | mysys/psi_noop.c | 19 |
2 files changed, 9 insertions, 78 deletions
diff --git a/mysys/md5_compute.cc b/mysys/md5_compute.cc deleted file mode 100644 index 7b1591d91b7..00000000000 --- a/mysys/md5_compute.cc +++ /dev/null @@ -1,68 +0,0 @@ -/* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. - - 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, - 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ - - -/** - @file - - @brief - Wrapper functions for OpenSSL, YaSSL and MySQL's MD5 - implementations. Also provides a Compatibility layer - to make available YaSSL's MD5 implementation. -*/ - -#include <my_global.h> -#include <my_md5.h> - -#ifdef HAVE_YASSL - -#include "md5.hpp" - -/** - Compute MD5 message digest. - - @param digest [out] Computed MD5 digest - @param buf [in] Message to be computed - @param len [in] Length of the message - - @return void -*/ -void my_md5_hash(char *digest, const char *buf, int len) -{ - TaoCrypt::MD5 hasher; - hasher.Update((TaoCrypt::byte *) buf, len); - hasher.Final((TaoCrypt::byte *) digest); -} -#endif /* HAVE_YASSL */ - - -/** - Wrapper function to compute MD5 message digest. - - @param digest [out] Computed MD5 digest - @param buf [in] Message to be computed - @param len [in] Length of the message - - @return void -*/ -void compute_md5_hash(char *digest, const char *buf, int len) -{ -#ifdef HAVE_YASSL - my_md5_hash(digest, buf, len); -#else - MY_MD5_HASH((unsigned char *) digest, (unsigned char const *) buf, len); -#endif /* HAVE_YASSL */ -} - diff --git a/mysys/psi_noop.c b/mysys/psi_noop.c index 2a351b5dd8d..6eecf56f797 100644 --- a/mysys/psi_noop.c +++ b/mysys/psi_noop.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2011, 2015, Oracle and/or its affiliates. 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 @@ -629,18 +629,17 @@ digest_start_noop(PSI_statement_locker *locker NNN) return NULL; } -static PSI_digest_locker* -digest_add_token_noop(PSI_digest_locker *locker NNN, - uint token NNN, - struct OPAQUE_LEX_YYSTYPE *yylval NNN) +static void +digest_end_noop(PSI_digest_locker *locker NNN, + const struct sql_digest_storage *digest NNN) { - return NULL; + return; } static int -set_thread_connect_attrs_noop(const char *buffer __attribute__((unused)), - uint length __attribute__((unused)), - const void *from_cs __attribute__((unused))) +set_thread_connect_attrs_noop(const char *buffer NNN, + uint length NNN, + const void *from_cs NNN) { return 0; } @@ -742,7 +741,7 @@ static PSI PSI_noop= set_socket_info_noop, set_socket_thread_owner_noop, digest_start_noop, - digest_add_token_noop, + digest_end_noop, set_thread_connect_attrs_noop }; |