Skip to content

Commit 6d100d5

Browse files
author
Robert Golebiowski
committed
Merge branch 'mysql-5.5' into mysql-5.6
2 parents 0f552f3 + e7ff204 commit 6d100d5

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

extra/yassl/README

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ before calling SSL_new();
1212

1313
*** end Note ***
1414

15+
yaSSL Patch notes, version 2.3.7c (6/12/2015)
16+
This release of yaSSL does certificate DATE comparisons to the second
17+
instead of to the minute, helpful when using freshly generated certs.
18+
Though keep in mind that time sync differences could still show up.
19+
1520
yaSSL Patch notes, version 2.3.7b (3/18/2015)
1621
This release of yaSSL fixes a potential crash with corrupted private keys.
1722
Also detects bad keys earlier for user.

extra/yassl/include/openssl/ssl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "rsa.h"
3535

3636

37-
#define YASSL_VERSION "2.3.7b"
37+
#define YASSL_VERSION "2.3.7c"
3838

3939

4040
#if defined(__cplusplus)

extra/yassl/taocrypt/src/asn.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ bool ASN1_TIME_extract(const unsigned char* date, unsigned char format,
8787
namespace { // locals
8888

8989

90-
// to the minute
90+
// to the second
9191
bool operator>(tm& a, tm& b)
9292
{
9393
if (a.tm_year > b.tm_year)
@@ -108,6 +108,11 @@ bool operator>(tm& a, tm& b)
108108
a.tm_min > b.tm_min)
109109
return true;
110110

111+
if (a.tm_year == b.tm_year && a.tm_mon == b.tm_mon &&
112+
a.tm_mday == b.tm_mday && a.tm_hour == b.tm_hour &&
113+
a.tm_min == b.tm_min && a.tm_sec > b.tm_sec)
114+
return true;
115+
111116
return false;
112117
}
113118

0 commit comments

Comments
 (0)