summaryrefslogtreecommitdiff
path: root/mysys_ssl
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-03-05 20:51:31 +0100
committerSergei Golubchik <serg@mariadb.org>2017-03-10 18:21:25 +0100
commit2b1bbac5fa881b8e135dbad3e0ff6b9e2763e24d (patch)
treee4083530fbd1a4fc8503b15f47cdd74d42af7bde /mysys_ssl
parentaa51b559abec01eca9f5a7628e4fe0a106ee8e52 (diff)
downloadmariadb-git-2b1bbac5fa881b8e135dbad3e0ff6b9e2763e24d.tar.gz
cleanup: remove a duplicate file
Diffstat (limited to 'mysys_ssl')
-rw-r--r--mysys_ssl/CMakeLists.txt1
-rw-r--r--mysys_ssl/my_rnd.cc103
2 files changed, 0 insertions, 104 deletions
diff --git a/mysys_ssl/CMakeLists.txt b/mysys_ssl/CMakeLists.txt
index 8a8f81d70ae..b00213bc492 100644
--- a/mysys_ssl/CMakeLists.txt
+++ b/mysys_ssl/CMakeLists.txt
@@ -36,7 +36,6 @@ SET(MYSYS_SSL_SOURCES
my_sha1.cc
my_sha2.cc
my_md5.cc
- my_rnd.cc
my_crypt.cc
)
diff --git a/mysys_ssl/my_rnd.cc b/mysys_ssl/my_rnd.cc
deleted file mode 100644
index aa8fb63cd4d..00000000000
--- a/mysys_ssl/my_rnd.cc
+++ /dev/null
@@ -1,103 +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, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-
-#include <my_global.h>
-#include <my_rnd.h>
-#include <m_string.h>
-
-#if defined(HAVE_YASSL)
-#if defined(YASSL_PREFIX)
-#define RAND_bytes yaRAND_bytes
-#endif /* YASSL_PREFIX */
-
-#include <openssl/ssl.h>
-
-#elif defined(HAVE_OPENSSL)
-#include <openssl/rand.h>
-#endif /* HAVE_YASSL */
-
-
-/*
- A wrapper to use OpenSSL/yaSSL PRNGs.
-*/
-
-extern "C" {
-
-/*
- Initialize random generator
-
- NOTES
- MySQL's password checks depends on this, so don't do any changes
- that changes the random numbers that are generated!
-*/
-
-void my_rnd_init(struct my_rnd_struct *rand_st, ulong seed1, ulong seed2)
-{
-#ifdef HAVE_valgrind
- bzero((char*) rand_st,sizeof(*rand_st)); /* Avoid UMC varnings */
-#endif
- rand_st->max_value= 0x3FFFFFFFL;
- rand_st->max_value_dbl=(double) rand_st->max_value;
- rand_st->seed1=seed1%rand_st->max_value ;
- rand_st->seed2=seed2%rand_st->max_value;
-}
-
-/**
- Generate random number.
-
- @param rand_st [INOUT] Structure used for number generation.
-
- @retval Generated pseudo random number.
-*/
-
-double my_rnd(struct my_rnd_struct *rand_st)
-{
- rand_st->seed1= (rand_st->seed1*3+rand_st->seed2) % rand_st->max_value;
- rand_st->seed2= (rand_st->seed1+rand_st->seed2+33) % rand_st->max_value;
- return (((double) rand_st->seed1) / rand_st->max_value_dbl);
-}
-
-/**
- Generate a random number using the OpenSSL/yaSSL supplied
- random number generator if available.
-
- @param rand_st [INOUT] Structure used for number generation
- only if none of the SSL libraries are
- available.
-
- @retval Generated random number.
-*/
-
-double my_rnd_ssl(struct my_rnd_struct *rand_st)
-{
-
-#if defined(HAVE_YASSL) || defined(HAVE_OPENSSL)
- int rc;
- unsigned int res;
-
-#if defined(HAVE_YASSL)
- rc= yaSSL::RAND_bytes((unsigned char *) &res, sizeof (unsigned int));
-#else
- rc= RAND_bytes((unsigned char *) &res, sizeof (unsigned int));
-#endif /* HAVE_YASSL */
- if (rc)
- return (double)res / (double)UINT_MAX;
-
-#endif /* defined(HAVE_YASSL) || defined(HAVE_OPENSSL) */
- return my_rnd(rand_st);
-}
-
-}