diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-05-15 13:18:42 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-05-15 13:18:42 +0300 |
| commit | 22e4b62e03da4290f0a40739914e4d0257990d50 (patch) | |
| tree | 189fa89f8104578f49995870f0decd93b5327b0a /extra | |
| parent | 375afcf1df5e5227e1f1835f1106b496c2ff8b95 (diff) | |
| parent | e4e19015692e727be655ce287f8cd6018d7fc6b2 (diff) | |
| download | mariadb-git-22e4b62e03da4290f0a40739914e4d0257990d50.tar.gz | |
merge 5.1->5.5
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/taocrypt/src/asn.cpp | 4 |
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(); |