diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-13 14:44:54 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-13 14:44:54 +0200 |
| commit | 59185bd6e3c9c89bea5263336083858f23254cf8 (patch) | |
| tree | 65d112885368e2d3ca0087ded0c04c028b746103 /extra/yassl/src/cert_wrapper.cpp | |
| parent | d2445603d67fba5d86d6757124ca9364d900d43a (diff) | |
| parent | cc2c1b3a25f1268361996090695e3334ed9c58fc (diff) | |
| download | mariadb-git-59185bd6e3c9c89bea5263336083858f23254cf8.tar.gz | |
merge mysql-5.1-security->mysql-5.5-security
Diffstat (limited to 'extra/yassl/src/cert_wrapper.cpp')
| -rw-r--r-- | extra/yassl/src/cert_wrapper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/yassl/src/cert_wrapper.cpp b/extra/yassl/src/cert_wrapper.cpp index d8660533f2e..7e73464001a 100644 --- a/extra/yassl/src/cert_wrapper.cpp +++ b/extra/yassl/src/cert_wrapper.cpp @@ -250,7 +250,8 @@ int CertManager::Validate() TaoCrypt::Source source((*last)->get_buffer(), (*last)->get_length()); TaoCrypt::CertDecoder cert(source, true, &signers_, verifyNone_); - if (int err = cert.GetError().What()) + int err = cert.GetError().What(); + if ( err ) return err; const TaoCrypt::PublicKey& key = cert.GetPublicKey(); @@ -266,7 +267,7 @@ int CertManager::Validate() TaoCrypt::CertDecoder cert(source, true, &signers_, verifyNone_); int err = cert.GetError().What(); - if ( err ) + if ( err && err != TaoCrypt::SIG_OTHER_E) return err; uint sz = cert.GetPublicKey().size(); @@ -327,7 +328,6 @@ int CertManager::SetPrivateKey(const x509& key) // Store OpenSSL type peer's cert void CertManager::setPeerX509(X509* x) { - assert(peerX509_ == 0); if (x == 0) return; X509_NAME* issuer = x->GetIssuer(); |