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

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

3 files changed, 6 insertions, 6 deletions

diff --git a/src/constructs/rfc3394/rfc3394.cpp b/src/constructs/rfc3394/rfc3394.cpp
index b000873fd..db6420ff3 100644
--- a/src/constructs/rfc3394/rfc3394.cpp
+++ b/src/constructs/rfc3394/rfc3394.cpp
@@ -39,7 +39,7 @@ SecureVector<byte> rfc3394_keywrap(const MemoryRegion<byte>& key,
    if(key.size() % 8 != 0)
       throw std::invalid_argument("Bad input key size for NIST key wrap");
 
-   std::auto_ptr<BlockCipher> aes(make_aes(kek.length(), af));
+   std::unique_ptr<BlockCipher> aes(make_aes(kek.length(), af));
    aes->set_key(kek);
 
    const size_t n = key.size() / 8;
@@ -81,7 +81,7 @@ SecureVector<byte> rfc3394_keyunwrap(const MemoryRegion<byte>& key,
    if(key.size() < 16 || key.size() % 8 != 0)
       throw std::invalid_argument("Bad input key size for NIST key unwrap");
 
-   std::auto_ptr<BlockCipher> aes(make_aes(kek.length(), af));
+   std::unique_ptr<BlockCipher> aes(make_aes(kek.length(), af));
    aes->set_key(kek);
 
    const size_t n = (key.size() - 8) / 8;
diff --git a/src/constructs/srp6/srp6.cpp b/src/constructs/srp6/srp6.cpp
index 287f0bdfb..b2785e7f6 100644
--- a/src/constructs/srp6/srp6.cpp
+++ b/src/constructs/srp6/srp6.cpp
@@ -20,7 +20,7 @@ BigInt hash_seq(const std::string& hash_id,
                 const BigInt& in1,
                 const BigInt& in2)
    {
-   std::auto_ptr<HashFunction> hash_fn(
+   std::unique_ptr<HashFunction> hash_fn(
       global_state().algorithm_factory().make_hash_function(hash_id));
 
    hash_fn->update(BigInt::encode_1363(in1, pad_to));
@@ -35,7 +35,7 @@ BigInt hash_seq(const std::string& hash_id,
                 const BigInt& in2,
                 const BigInt& in3)
    {
-   std::auto_ptr<HashFunction> hash_fn(
+   std::unique_ptr<HashFunction> hash_fn(
       global_state().algorithm_factory().make_hash_function(hash_id));
 
    hash_fn->update(BigInt::encode_1363(in1, pad_to));
@@ -50,7 +50,7 @@ BigInt compute_x(const std::string& hash_id,
                  const std::string& password,
                  const MemoryRegion<byte>& salt)
    {
-   std::auto_ptr<HashFunction> hash_fn(
+   std::unique_ptr<HashFunction> hash_fn(
       global_state().algorithm_factory().make_hash_function(hash_id));
 
    hash_fn->update(identifier);
diff --git a/src/constructs/tss/tss.cpp b/src/constructs/tss/tss.cpp
index d0a18f534..cc34216f3 100644
--- a/src/constructs/tss/tss.cpp
+++ b/src/constructs/tss/tss.cpp
@@ -205,7 +205,7 @@ RTSS_Share::reconstruct(const std::vector<RTSS_Share>& shares)
 
    byte hash_id = shares[0].contents[16];
 
-   std::auto_ptr<HashFunction> hash(get_rtss_hash_by_id(hash_id));
+   std::unique_ptr<HashFunction> hash(get_rtss_hash_by_id(hash_id));
 
    if(shares[0].size() != secret_len + hash->output_length() + RTSS_HEADER_SIZE + 1)
       throw Decoding_Error("Bad RTSS length field in header");