summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2012-05-15 13:12:22 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2012-05-15 13:12:22 +0300
commitfcb033053d72502366f890c4652603c6cbc4fadb (patch)
tree6c572203086cf87f3225bdfb9a4c4ecfa39de1b3 /extra
parente72278fd423d98181d1c4da34e8369e7219b05f8 (diff)
downloadmariadb-git-fcb033053d72502366f890c4652603c6cbc4fadb.tar.gz
Bug #11761822: yassl rejects valid certificate which openssl accepts
Applied the fix that updates yaSSL to 2.2.1 and fixes parsing this particular certificate. Added a test case with the certificate itself.
Diffstat (limited to 'extra')
-rw-r--r--extra/yassl/taocrypt/src/asn.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/extra/yassl/taocrypt/src/asn.cpp b/extra/yassl/taocrypt/src/asn.cpp
index a502666d15b..5ec4cac1c44 100644
--- a/extra/yassl/taocrypt/src/asn.cpp
+++ b/extra/yassl/taocrypt/src/asn.cpp
@@ -758,6 +758,10 @@ void CertDecoder::GetName(NameType nt)
while (source_.get_index() < length) {
GetSet();
+ if (source_.GetError().What() == SET_E) {
+ source_.SetError(NO_ERROR_E); // extensions may only have sequence
+ source_.prev();
+ }
GetSequence();
byte b = source_.next();