diff options
| author | lloyd <[email protected]> | 2010-11-29 22:52:17 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-11-29 22:52:17 +0000 |
| commit | 0e41e0e8d441ff907f092c718db650cda06e2e1a (patch) | |
| tree | 8c0df20500bdf601d4378a6000923501a48ad1f3 /src/ssl | |
| parent | 5d4621b745ac529c7df6c4d91e4d2b68bd0325e4 (diff) | |
| parent | 65ab36776317f73ddf0f2d3bd6c1c7e35608962f (diff) | |
propagate from branch 'net.randombit.botan' (head fc8daa606ab7954eab48778d7236986747b719e4)
to branch 'net.randombit.botan.c++0x' (head 2bf71b0a2e0e468d7eb3631e4ca284234f554729)
Diffstat (limited to 'src/ssl')
| -rw-r--r-- | src/ssl/tls_policy.cpp | 8 | ||||
| -rw-r--r-- | src/ssl/tls_policy.h | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/ssl/tls_policy.cpp b/src/ssl/tls_policy.cpp index 38fcf58cc..b73ff7850 100644 --- a/src/ssl/tls_policy.cpp +++ b/src/ssl/tls_policy.cpp @@ -115,12 +115,4 @@ DL_Group TLS_Policy::dh_group() const return DL_Group("modp/ietf/1024"); } -/* -* Default certificate check -*/ -bool TLS_Policy::check_cert(const std::vector<X509_Certificate>& certs) const - { - return true; - } - } diff --git a/src/ssl/tls_policy.h b/src/ssl/tls_policy.h index c5944f0f7..461164d2f 100644 --- a/src/ssl/tls_policy.h +++ b/src/ssl/tls_policy.h @@ -39,10 +39,17 @@ class BOTAN_DLL TLS_Policy virtual DL_Group dh_group() const; virtual size_t rsa_export_keysize() const { return 512; } + /* + * @return the minimum version that we will negotiate + */ virtual Version_Code min_version() const { return SSL_V3; } + + /* + * @return the version we would prefer to negotiate + */ virtual Version_Code pref_version() const { return TLS_V11; } - virtual bool check_cert(const std::vector<X509_Certificate>& cert_chain) const; + virtual bool check_cert(const std::vector<X509_Certificate>& cert_chain) const = 0; virtual ~TLS_Policy() {} private: |