diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-27 11:08:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-27 11:08:51 +0300 |
| commit | c0cd662b986c378d536cff511ba7ba342fcd7012 (patch) | |
| tree | 3e847036333ae9fe7a4e0a127e7c303376334cf8 /mysys | |
| parent | ff10e0f6461f875967728228f71c8909eeaf41c4 (diff) | |
| parent | e32212c63c9675591e9c4b15c1bce9f61ec02eb8 (diff) | |
| download | mariadb-git-c0cd662b986c378d536cff511ba7ba342fcd7012.tar.gz | |
Merge 10.4 to 10.5
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_rnd.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/mysys/my_rnd.c b/mysys/my_rnd.c index c38682a2012..0af251b4ade 100644 --- a/mysys/my_rnd.c +++ b/mysys/my_rnd.c @@ -78,20 +78,11 @@ double my_rnd(struct my_rnd_struct *rand_st) 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 +#if defined(HAVE_OPENSSL) 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) */ +#endif /* defined(HAVE_OPENSSL) */ return my_rnd(rand_st); } |