diff options
| author | lloyd <[email protected]> | 2012-02-20 17:09:46 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-02-20 17:09:46 +0000 |
| commit | 8c2dc1a6c3bf352a56622d569dc855ca8d6ab5e0 (patch) | |
| tree | 6f50627e2e73c2b1fc1295dde8b19c4f169de46d /src/constructs/rfc3394 | |
| parent | 24c1546324995da70c51137ad138c3bb997a37b9 (diff) | |
| parent | e943fc67962b6e4dc2c7c64707dc2cf062728520 (diff) | |
propagate from branch 'net.randombit.botan.tls-state-machine' (head 0ceb9cde62a2b3614901ae85a53546d9fc641326)
to branch 'net.randombit.botan.cxx11' (head 777e65950ef3706a82e5df20dcca7fcc999ca533)
Diffstat (limited to 'src/constructs/rfc3394')
| -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; |