summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorRobert Golebiowski <robert.golebiowski@oracle.com>2015-09-18 10:35:09 +0200
committerBjorn Munch <bjorn.munch@oracle.com>2015-09-18 16:13:18 +0200
commit0243a2d432abb609af890aea5a417862aa4514cb (patch)
treec96d33c6c9b8f88f710339919e0423a6f25d34f7 /extra
parentb1895fb8c924e7152b73765cfd02b686362ca76c (diff)
downloadmariadb-git-0243a2d432abb609af890aea5a417862aa4514cb.tar.gz
Bug #21025377 CAN'T CONNECT TO SSL ENABLED SERVER FIRST 30 SEC AFTER
INITIAL STARTUP Updated yassl to yassl-2.3.7e (cherry picked from commit 6e21c8c04b922bdb60b6a7c174709d2e1bdd3618)
Diffstat (limited to 'extra')
-rw-r--r--extra/yassl/README7
-rw-r--r--extra/yassl/include/openssl/ssl.h2
-rw-r--r--extra/yassl/taocrypt/src/asn.cpp2
3 files changed, 9 insertions, 2 deletions
diff --git a/extra/yassl/README b/extra/yassl/README
index 2560c09addd..47ec1a66ea3 100644
--- a/extra/yassl/README
+++ b/extra/yassl/README
@@ -12,6 +12,13 @@ before calling SSL_new();
*** end Note ***
+yaSSL Patch notes, version 2.3.7e (6/26/2015)
+ This release of yaSSL includes a fix for Date less than comparison.
+ Previously yaSSL would return true on less than comparisons if the Dates
+ were equal. Reported by Oracle. No security problem, but if a cert was
+ generated right now, a server started using it in the same second, and a
+ client tried to verify it in the same second it would report not yet valid.
+
yaSSL Patch notes, version 2.3.7d (6/22/2015)
This release of yaSSL includes a fix for input_buffer set_current with
index 0. SSL_peek() at front of waiting data could trigger. Robert
diff --git a/extra/yassl/include/openssl/ssl.h b/extra/yassl/include/openssl/ssl.h
index 692d8b270d2..9e16f9278a7 100644
--- a/extra/yassl/include/openssl/ssl.h
+++ b/extra/yassl/include/openssl/ssl.h
@@ -35,7 +35,7 @@
#include "rsa.h"
-#define YASSL_VERSION "2.3.7d"
+#define YASSL_VERSION "2.3.7e"
#if defined(__cplusplus)
diff --git a/extra/yassl/taocrypt/src/asn.cpp b/extra/yassl/taocrypt/src/asn.cpp
index 342255c91b8..c419ec0a992 100644
--- a/extra/yassl/taocrypt/src/asn.cpp
+++ b/extra/yassl/taocrypt/src/asn.cpp
@@ -71,7 +71,7 @@ bool operator>(tm& a, tm& b)
bool operator<(tm& a, tm&b)
{
- return !(a>b);
+ return (b>a);
}