diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-10 11:10:07 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-02-10 11:10:07 +0200 |
| commit | a25adb1cc830d7e263daa03560a129ac9cd6828a (patch) | |
| tree | 97ca7c617705640e96a1d84489aac41bfe6585a5 /extra/yassl/include/yassl_imp.hpp | |
| parent | 12376c17b3d79aea4b905980ba0ae25f669e20ce (diff) | |
| download | mariadb-git-a25adb1cc830d7e263daa03560a129ac9cd6828a.tar.gz | |
Bug#13706621 : UNIFY THE YASSL VERSIONS THAT WE USE BY BACKPORTING 5.1
AND 5.5 YASSL FIXES.
Took the 5.5 yassl code and applied it to the 5.0 codebase, keeping the
compilation files.
Diffstat (limited to 'extra/yassl/include/yassl_imp.hpp')
| -rw-r--r-- | extra/yassl/include/yassl_imp.hpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/extra/yassl/include/yassl_imp.hpp b/extra/yassl/include/yassl_imp.hpp index f6434443cb0..04e85c16a04 100644 --- a/extra/yassl/include/yassl_imp.hpp +++ b/extra/yassl/include/yassl_imp.hpp @@ -1,5 +1,6 @@ /* - Copyright (C) 2000-2007 MySQL AB + Copyright (c) 2005-2007 MySQL AB, 2008 Sun Microsystems, Inc. + Use is subject to license terms. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -667,10 +668,12 @@ struct Parameters { Cipher suites_[MAX_SUITE_SZ]; char cipher_name_[MAX_SUITE_NAME]; char cipher_list_[MAX_CIPHERS][MAX_SUITE_NAME]; + bool removeDH_; // for server's later use Parameters(ConnectionEnd, const Ciphers&, ProtocolVersion, bool haveDH); - void SetSuites(ProtocolVersion pv, bool removeDH = false); + void SetSuites(ProtocolVersion pv, bool removeDH = false, + bool removeRSA = false, bool removeDSA = false); void SetCipherNames(); private: Parameters(const Parameters&); // hide copy |