diff options
| author | lloyd <[email protected]> | 2012-01-20 16:04:08 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-01-20 16:04:08 +0000 |
| commit | b9980348ccd1687f44f53532f81c605aa4a1d752 (patch) | |
| tree | b4dc2953441827e1d670a886a9d6d6f5c30bf127 /src/tls/cert_ver.cpp | |
| parent | 27e2ba976a410d117b651541a42572d5743d41a0 (diff) | |
TLS_Ciphersuite_Algos was just a strange level of indirection between
the ciphersuite code and a set of strings specifying the underlying
suite algorithms. Remove it entirely.
Some things are likely broken. One I know about is that we always send
the hash/signature type indicator but should only do so for TLS >= 1.2
Diffstat (limited to 'src/tls/cert_ver.cpp')
| -rw-r--r-- | src/tls/cert_ver.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/tls/cert_ver.cpp b/src/tls/cert_ver.cpp index f7386dd13..97cd468b9 100644 --- a/src/tls/cert_ver.cpp +++ b/src/tls/cert_ver.cpp @@ -9,11 +9,6 @@ #include <botan/internal/tls_reader.h> #include <botan/internal/tls_extensions.h> #include <botan/internal/assert.h> -#include <botan/tls_exceptn.h> -#include <botan/pubkey.h> -#include <botan/rsa.h> -#include <botan/dsa.h> -#include <botan/loadstor.h> #include <memory> namespace Botan { @@ -59,16 +54,10 @@ Certificate_Verify::Certificate_Verify(const MemoryRegion<byte>& buf, { TLS_Data_Reader reader(buf); - if(version < TLS_V12) + if(version >= TLS_V12) { - // use old defaults - hash_algo = TLS_ALGO_NONE; - sig_algo = TLS_ALGO_NONE; - } - else - { - hash_algo = Signature_Algorithms::hash_algo_code(reader.get_byte()); - sig_algo = Signature_Algorithms::sig_algo_code(reader.get_byte()); + hash_algo = Signature_Algorithms::hash_algo_name(reader.get_byte()); + sig_algo = Signature_Algorithms::sig_algo_name(reader.get_byte()); } signature = reader.get_range<byte>(2, 0, 65535); @@ -81,7 +70,7 @@ MemoryVector<byte> Certificate_Verify::serialize() const { MemoryVector<byte> buf; - if(hash_algo != TLS_ALGO_NONE) + if(hash_algo != "" && sig_algo != "") { buf.push_back(Signature_Algorithms::hash_algo_code(hash_algo)); buf.push_back(Signature_Algorithms::sig_algo_code(sig_algo)); |