diff options
author | msvensson@shellback.(none) <> | 2006-07-17 10:50:20 +0200 |
---|---|---|
committer | msvensson@shellback.(none) <> | 2006-07-17 10:50:20 +0200 |
commit | 011f57e0ec154f0a2696170341fdef8bc893f08c (patch) | |
tree | 28bc4accce8d8fa71240036de8d06a57b61e044a /extra/yassl/taocrypt/src/asn.cpp | |
parent | 5ae586d946cc19dc312a34bc58cd6272213960b4 (diff) | |
download | mariadb-git-011f57e0ec154f0a2696170341fdef8bc893f08c.tar.gz |
Import yaSSL version 1.3.7
- Fix for "bug#16755 Please find a SSL library that is FLOSS-Exception / LGPL copyrighted"
Diffstat (limited to 'extra/yassl/taocrypt/src/asn.cpp')
-rw-r--r-- | extra/yassl/taocrypt/src/asn.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/extra/yassl/taocrypt/src/asn.cpp b/extra/yassl/taocrypt/src/asn.cpp index 383fe65dea6..beb5490bb66 100644 --- a/extra/yassl/taocrypt/src/asn.cpp +++ b/extra/yassl/taocrypt/src/asn.cpp @@ -9,6 +9,10 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * + * There are special exceptions to the terms and conditions of the GPL as it + * is applied to yaSSL. View the full text of the exception in the file + * FLOSS-EXCEPTIONS in the directory of this software distribution. + * * yaSSL is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -472,16 +476,7 @@ void CertDecoder::Decode(SignerList* signers, CertType ct) return; } - if (ct == CA) { - if ( memcmp(issuerHash_, subjectHash_, SHA::DIGEST_SIZE) == 0 ) { - if (!ValidateSelfSignature() && verify_) - source_.SetError(SIG_CONFIRM_E); - } - else - if (!ValidateSignature(signers) && verify_) - source_.SetError(SIG_OTHER_E); - } - else if (!ValidateSignature(signers) && verify_) + if (ct != CA && verify_ && !ValidateSignature(signers)) source_.SetError(SIG_OTHER_E); } |