Skip to content

Commit e40190b

Browse files
author
Robert Golebiowski
committed
Merge branch 'mysql-5.5' into mysql-5.6
2 parents 6d100d5 + 7255ae6 commit e40190b

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-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.7d (6/22/2015)
16+
This release of yaSSL includes a fix for input_buffer set_current with
17+
index 0. SSL_peek() at front of waiting data could trigger. Robert
18+
Golebiowski of Oracle identified and suggested a fix, thanks!
19+
1520
yaSSL Patch notes, version 2.3.7c (6/12/2015)
1621
This release of yaSSL does certificate DATE comparisons to the second
1722
instead of to the minute, helpful when using freshly generated certs.

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.7c"
37+
#define YASSL_VERSION "2.3.7d"
3838

3939

4040
#if defined(__cplusplus)

extra/yassl/src/buffer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ void input_buffer::set_error()
164164

165165
void input_buffer::set_current(uint i)
166166
{
167-
if (error_ == 0 && i && check(i - 1, size_) == 0)
167+
if (error_ == 0 && check(i ? i - 1 : 0, size_) == 0)
168168
current_ = i;
169169
else
170170
error_ = -1;

0 commit comments

Comments
 (0)