diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2017-01-18 20:19:36 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2017-01-18 20:19:36 +0000 |
| commit | eaa122ead180917df69f323c8b0bd819831c6ed5 (patch) | |
| tree | 5f41cdd860c23e0e0a64e4046de764d8d593f37b /databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc | |
| parent | security/vuxml: Document mysql vulnerabilities (diff) | |
databases/mariadb101-server: Update to 10.1.21
- Update to 10.1.21
- Fix patches that no longer cleanly apply
- Rename patches to new naming scheme
MFH: 2017Q1
Security: 4d2f9d09-ddb7-11e6-a9a5-b499baebfeaf
Diffstat (limited to 'databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc')
| -rw-r--r-- | databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc b/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc new file mode 100644 index 000000000000..f447253d3164 --- /dev/null +++ b/databases/mariadb101-server/files/patch-mysys__ssl_my__crypt.cc @@ -0,0 +1,25 @@ +--- mysys_ssl/my_crypt.cc.orig 2017-01-17 19:38:25 UTC ++++ mysys_ssl/my_crypt.cc +@@ -275,10 +275,14 @@ int my_random_bytes(uchar* buf, int num) + return MY_AES_OK; + } + #else ++#include <openssl/opensslv.h> + #include <openssl/rand.h> + + int my_random_bytes(uchar *buf, int num) + { ++#if defined(LIBRESSL_VERSION_NUMBER) ++ arc4random_buf(buf, num); ++#else + /* + Unfortunately RAND_bytes manual page does not provide any guarantees + in relation to blocking behavior. Here we explicitly use SSLeay random +@@ -288,6 +292,7 @@ int my_random_bytes(uchar *buf, int num) + RAND_METHOD *rand = RAND_SSLeay(); + if (rand == NULL || rand->bytes(buf, num) != 1) + return MY_AES_OPENSSL_ERROR; ++#endif + return MY_AES_OK; + } + #endif |