Merge branch 'mysql-5.5' into mysql-5.6

Robert Golebiowski · Robert Golebiowski · commit 6d100d55c1f5 · 2015-07-08T13:35:37.000+02:00
diff --git a/extra/yassl/README b/extra/yassl/README
@@ -12,6 +12,11 @@ before calling SSL_new();
 
 *** end Note ***
 
+yaSSL Patch notes, version 2.3.7c (6/12/2015)
+    This release of yaSSL does certificate DATE comparisons to the second
+    instead of to the minute, helpful when using freshly generated certs.
+    Though keep in mind that time sync differences could still show up.
+
 yaSSL Patch notes, version 2.3.7b (3/18/2015)
     This release of yaSSL fixes a potential crash with corrupted private keys.
     Also detects bad keys earlier for user.
diff --git a/extra/yassl/include/openssl/ssl.h b/extra/yassl/include/openssl/ssl.h
@@ -34,7 +34,7 @@
 #include "rsa.h"
 
 
-#define YASSL_VERSION "2.3.7b"
+#define YASSL_VERSION "2.3.7c"
 
 
 #if defined(__cplusplus)
diff --git a/extra/yassl/taocrypt/src/asn.cpp b/extra/yassl/taocrypt/src/asn.cpp
@@ -87,7 +87,7 @@ bool ASN1_TIME_extract(const unsigned char* date, unsigned char format,
 namespace { // locals
 
 
-// to the minute
+// to the second
 bool operator>(tm& a, tm& b)
 {
     if (a.tm_year > b.tm_year)
@@ -108,6 +108,11 @@ bool operator>(tm& a, tm& b)
         a.tm_min > b.tm_min)
         return true;
 
+    if (a.tm_year == b.tm_year && a.tm_mon == b.tm_mon &&
+        a.tm_mday == b.tm_mday && a.tm_hour == b.tm_hour &&
+        a.tm_min  == b.tm_min  && a.tm_sec > b.tm_sec)
+        return true;
+
     return false;
 }
 
