diff options
author | lloyd <[email protected]> | 2011-03-08 22:23:25 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2011-03-08 22:23:25 +0000 |
commit | 1a28f7ef6064041955e7a662c5e087bbea03b6ad (patch) | |
tree | 63046692850d3b2411001daf841a38c23016f123 /src/constructs | |
parent | e8ae96510f3d87e3b142df81b51c3b15e30e77f9 (diff) |
Use unique_ptr instead of auto_ptr
Use std::to_string in bcrypt
Diffstat (limited to 'src/constructs')
-rw-r--r-- | src/constructs/rfc3394/rfc3394.cpp | 4 |
1 files changed, 2 insertions, 2 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; |