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 | 5cfe937f24647dc8f2ddc66a6b1899a298322349 (patch) | |
| tree | 65d112885368e2d3ca0087ded0c04c028b746103 /extra/yassl/taocrypt/src/rsa.cpp | |
| parent | 89b6cb72c9ca8bac35dcfdee414e2eb4cc87971b (diff) | |
| parent | 0966b866b1ac8a9132f917c29244c31f99bb3893 (diff) | |
| download | mariadb-git-5cfe937f24647dc8f2ddc66a6b1899a298322349.tar.gz | |
merge mysql-5.1-security->mysql-5.5-security
Diffstat (limited to 'extra/yassl/taocrypt/src/rsa.cpp')
| -rw-r--r-- | extra/yassl/taocrypt/src/rsa.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/extra/yassl/taocrypt/src/rsa.cpp b/extra/yassl/taocrypt/src/rsa.cpp index 57d19a59c76..576146377a3 100644 --- a/extra/yassl/taocrypt/src/rsa.cpp +++ b/extra/yassl/taocrypt/src/rsa.cpp @@ -61,7 +61,6 @@ Integer RSA_PrivateKey::CalculateInverse(RandomNumberGenerator& rng, Integer y = ModularRoot(re, dq_, dp_, q_, p_, u_); y = modn.Divide(y, r); // unblind - assert(modn.Exponentiate(y, e_) == x); // check return y; } @@ -124,7 +123,8 @@ word32 RSA_BlockType2::UnPad(const byte *pkcsBlock, unsigned int pkcsBlockLen, unsigned i=1; while (i<pkcsBlockLen && pkcsBlock[i++]) { // null body } - assert(i==pkcsBlockLen || pkcsBlock[i-1]==0); + if (!(i==pkcsBlockLen || pkcsBlock[i-1]==0)) + return 0; unsigned int outputLen = pkcsBlockLen - i; invalid = (outputLen > maxOutputLen) || invalid; @@ -179,7 +179,8 @@ word32 RSA_BlockType1::UnPad(const byte* pkcsBlock, word32 pkcsBlockLen, unsigned i=1; while (i<pkcsBlockLen && pkcsBlock[i++]) { // null body } - assert(i==pkcsBlockLen || pkcsBlock[i-1]==0); + if (!(i==pkcsBlockLen || pkcsBlock[i-1]==0)) + return 0; unsigned int outputLen = pkcsBlockLen - i; invalid = (outputLen > maxOutputLen) || invalid; |