diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-15 15:22:39 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-15 15:22:39 +0400 |
| commit | 9f6c4ad8a825e70ab688cdd0200e7d72aede0353 (patch) | |
| tree | 0d0667f9aefd2222dce191629503f3a3f5cd78e7 /extra/yassl/taocrypt | |
| parent | 151e5d586cc59afb3c664d56d47265c964fe7fb1 (diff) | |
| download | mariadb-git-9f6c4ad8a825e70ab688cdd0200e7d72aede0353.tar.gz | |
Post-merge fixes
Diffstat (limited to 'extra/yassl/taocrypt')
| -rw-r--r-- | extra/yassl/taocrypt/include/modes.hpp | 2 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/src/asn.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extra/yassl/taocrypt/include/modes.hpp b/extra/yassl/taocrypt/include/modes.hpp index f377ff85651..4575fe1414b 100644 --- a/extra/yassl/taocrypt/include/modes.hpp +++ b/extra/yassl/taocrypt/include/modes.hpp @@ -95,7 +95,7 @@ inline void Mode_BASE::Process(byte* out, const byte* in, word32 sz) { if (mode_ == ECB) ECB_Process(out, in, sz); - else if (mode_ == CBC) { + else if (mode_ == CBC) { if (dir_ == ENCRYPTION) CBC_Encrypt(out, in, sz); diff --git a/extra/yassl/taocrypt/src/asn.cpp b/extra/yassl/taocrypt/src/asn.cpp index 530dd4bed04..78200841bda 100644 --- a/extra/yassl/taocrypt/src/asn.cpp +++ b/extra/yassl/taocrypt/src/asn.cpp @@ -1063,7 +1063,7 @@ word32 DecodeDSA_Signature(byte* decoded, const byte* encoded, word32 sz) return 0; } word32 rLen = GetLength(source); - if (rLen != 20) { + if (rLen != 20) { if (rLen == 21) { // zero at front, eat source.next(); @@ -1087,7 +1087,7 @@ word32 DecodeDSA_Signature(byte* decoded, const byte* encoded, word32 sz) return 0; } word32 sLen = GetLength(source); - if (sLen != 20) { + if (sLen != 20) { if (sLen == 21) { source.next(); // zero at front, eat |