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 | |
| parent | 151e5d586cc59afb3c664d56d47265c964fe7fb1 (diff) | |
| download | mariadb-git-9f6c4ad8a825e70ab688cdd0200e7d72aede0353.tar.gz | |
Post-merge fixes
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/src/handshake.cpp | 4 | ||||
| -rw-r--r-- | extra/yassl/src/yassl_imp.cpp | 1 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/include/modes.hpp | 2 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/src/asn.cpp | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/extra/yassl/src/handshake.cpp b/extra/yassl/src/handshake.cpp index 43f446ec76f..b4d9005af15 100644 --- a/extra/yassl/src/handshake.cpp +++ b/extra/yassl/src/handshake.cpp @@ -789,7 +789,7 @@ void processReply(SSL& ssl) { if (ssl.GetError()) return; - if (DoProcessReply(ssl)) { + if (DoProcessReply(ssl)) { // didn't complete process if (!ssl.getSocket().IsNonBlocking()) { @@ -874,7 +874,7 @@ void sendServerKeyExchange(SSL& ssl, BufferOutput buffer) // send change cipher void sendChangeCipher(SSL& ssl, BufferOutput buffer) { - if (ssl.getSecurity().get_parms().entity_ == server_end) { + if (ssl.getSecurity().get_parms().entity_ == server_end) { if (ssl.getSecurity().get_resuming()) ssl.verifyState(clientKeyExchangeComplete); diff --git a/extra/yassl/src/yassl_imp.cpp b/extra/yassl/src/yassl_imp.cpp index 9ced6493d8b..d0eabce7bc9 100644 --- a/extra/yassl/src/yassl_imp.cpp +++ b/extra/yassl/src/yassl_imp.cpp @@ -1305,7 +1305,6 @@ void ServerHello::Process(input_buffer&, SSL& ssl) ssl.useSecurity().use_connection().sessionID_Set_ = false; if (ssl.getSecurity().get_resuming()) { - { if (memcmp(session_id_, ssl.getSecurity().get_resume().GetID(), ID_LEN) == 0) { ssl.set_masterSecret(ssl.getSecurity().get_resume().GetSecret()); 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 |