propagate from branch 'net.randombit.botan.tls-state-machine' (head 0ceb9cde62a2b3614901ae85a53546d9fc641326)

            to branch 'net.randombit.botan.cxx11' (head 777e65950ef3706a82e5df20dcca7fcc999ca533)

4 files changed, 4 insertions, 19 deletions

diff --git a/src/tls/cert_ver.cpp b/src/tls/cert_ver.cpp
index 791635b17..ffcba84d8 100644
--- a/src/tls/cert_ver.cpp
+++ b/src/tls/cert_ver.cpp
@@ -92,7 +92,7 @@ MemoryVector<byte> Certificate_Verify::serialize() const
 bool Certificate_Verify::verify(const X509_Certificate& cert,
                                 Handshake_State* state)
    {
-   std::auto_ptr<Public_Key> key(cert.subject_public_key());
+   std::unique_ptr<Public_Key> key(cert.subject_public_key());
 
    std::pair<std::string, Signature_Format> format =
       state->understand_sig_format(key.get(), hash_algo, sig_algo, true);
diff --git a/src/tls/info.txt b/src/tls/info.txt
index 31ce43c1e..68ca026d5 100644
--- a/src/tls/info.txt
+++ b/src/tls/info.txt
@@ -5,8 +5,6 @@ The TLS code is complex, new, and not yet reviewed, there may be
 serious bugs or security issues.
 </comment>
 
-uses_tr1 yes
-
 <header:public>
 tls_alert.h
 tls_channel.h
diff --git a/src/tls/s_kex.cpp b/src/tls/s_kex.cpp
index f25205e99..6a5cdfa33 100644
--- a/src/tls/s_kex.cpp
+++ b/src/tls/s_kex.cpp
@@ -210,7 +210,7 @@ MemoryVector<byte> Server_Key_Exchange::serialize() const
 bool Server_Key_Exchange::verify(const X509_Certificate& cert,
                                  Handshake_State* state) const
    {
-   std::auto_ptr<Public_Key> key(cert.subject_public_key());
+   std::unique_ptr<Public_Key> key(cert.subject_public_key());
 
    std::pair<std::string, Signature_Format> format =
       state->understand_sig_format(key.get(), m_hash_algo, m_sig_algo, false);
diff --git a/src/tls/tls_record.h b/src/tls/tls_record.h
index 3bc58a0da..f91cb6fe2 100644
--- a/src/tls/tls_record.h
+++ b/src/tls/tls_record.h
@@ -16,20 +16,7 @@
 #include <botan/mac.h>
 #include <botan/secqueue.h>
 #include <vector>
-
-#if defined(BOTAN_USE_STD_TR1)
-
-#if defined(BOTAN_BUILD_COMPILER_IS_MSVC)
-    #include <functional>
-#else
-    #include <tr1/functional>
-#endif
-
-#elif defined(BOTAN_USE_BOOST_TR1)
-  #include <boost/tr1/functional.hpp>
-#else
-  #error "No TR1 library defined for use"
-#endif
+#include <functional>
 
 namespace Botan {
 
@@ -59,7 +46,7 @@ class BOTAN_DLL Record_Writer
 
       void set_maximum_fragment_size(size_t max_fragment);
 
-      Record_Writer(std::tr1::function<void (const byte[], size_t)> output_fn);
+      Record_Writer(std::function<void (const byte[], size_t)> output_fn);
 
       ~Record_Writer() { delete m_mac; }
    private: