diff options
| author | lloyd <[email protected]> | 2010-09-03 13:55:19 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-09-03 13:55:19 +0000 |
| commit | 7e54763ea43c8b34729387c7429922dd981c4f5b (patch) | |
| tree | 33a1bd0f32e4ab7958a484e468316291c527dd24 /checks/pk.cpp | |
| parent | fb68795162b8d107cbd284c4a75d8e13ce589829 (diff) | |
| parent | ec8c59af3db02ff159908f9a446e53c4ea20d474 (diff) | |
propagate from branch 'net.randombit.botan' (head a29c41b4a949207b1544096c3afab668f8b5179e)
to branch 'net.randombit.botan.c++0x' (head a9d0c2f805b3c20a4c648575d7256959db8329fe)
Diffstat (limited to 'checks/pk.cpp')
| -rw-r--r-- | checks/pk.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/checks/pk.cpp b/checks/pk.cpp index 0d06e0983..fe8df10b3 100644 --- a/checks/pk.cpp +++ b/checks/pk.cpp @@ -247,7 +247,7 @@ u32bit validate_rsa_enc_pkcs8(const std::string& algo, DataSource_Memory keysource(reinterpret_cast<const byte*>(str[0].c_str()), str[0].length()); - std::auto_ptr<Private_Key> privkey(PKCS8::load_key(keysource, rng, pass)); + std::unique_ptr<Private_Key> privkey(PKCS8::load_key(keysource, rng, pass)); RSA_PrivateKey* rsapriv = dynamic_cast<RSA_PrivateKey*>(privkey.get()); if(!rsapriv) @@ -388,7 +388,7 @@ u32bit validate_rsa_ver_x509(const std::string& algo, DataSource_Memory keysource(reinterpret_cast<const byte*>(str[0].c_str()), str[0].length()); - std::auto_ptr<Public_Key> key(X509::load_key(keysource)); + std::unique_ptr<Public_Key> key(X509::load_key(keysource)); RSA_PublicKey* rsakey = dynamic_cast<RSA_PublicKey*>(key.get()); @@ -476,7 +476,7 @@ u32bit validate_dsa_sig(const std::string& algo, DataSource_Memory keysource(reinterpret_cast<const byte*>(str[0].c_str()), str[0].length()); - std::auto_ptr<Private_Key> privkey(PKCS8::load_key(keysource, rng, pass)); + std::unique_ptr<Private_Key> privkey(PKCS8::load_key(keysource, rng, pass)); DSA_PrivateKey* dsapriv = dynamic_cast<DSA_PrivateKey*>(privkey.get()); if(!dsapriv) @@ -560,7 +560,7 @@ u32bit validate_dsa_ver(const std::string& algo, #if defined(BOTAN_HAS_DSA) - std::auto_ptr<Public_Key> key(X509::load_key(keysource)); + std::unique_ptr<Public_Key> key(X509::load_key(keysource)); DSA_PublicKey* dsakey = dynamic_cast<DSA_PublicKey*>(key.get()); |