diff options
| author | lloyd <[email protected]> | 2010-03-21 23:30:14 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-03-21 23:30:14 +0000 |
| commit | f8a77dd91e8b3aed644c2c206ff9b8822fb3ae02 (patch) | |
| tree | 315cbc118a8ba2afda674154e7c65e8900a00cb8 /src/pubkey/pkcs8.cpp | |
| parent | 572c106e868821da13447ca7349523ef4a90ec2c (diff) | |
| parent | 634f3d27f7faad1dc558821382f71ecc2194637d (diff) | |
propagate from branch 'net.randombit.botan' (head 96d0a1885774b624812fd143d541c8bcda319217)
to branch 'net.randombit.botan.c++0x' (head e14368ab9d7976f3e111c6bc0adf24eebeb7c114)
Diffstat (limited to 'src/pubkey/pkcs8.cpp')
| -rw-r--r-- | src/pubkey/pkcs8.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pubkey/pkcs8.cpp b/src/pubkey/pkcs8.cpp index 35ff7f206..7353be42f 100644 --- a/src/pubkey/pkcs8.cpp +++ b/src/pubkey/pkcs8.cpp @@ -89,7 +89,7 @@ SecureVector<byte> PKCS8_decode(DataSource& source, const User_Interface& ui, if(is_encrypted) { DataSource_Memory params(pbe_alg_id.parameters); - std::auto_ptr<PBE> pbe(get_pbe(pbe_alg_id.oid, params)); + std::unique_ptr<PBE> pbe(get_pbe(pbe_alg_id.oid, params)); User_Interface::UI_Result result = User_Interface::OK; const std::string passphrase = @@ -166,7 +166,7 @@ void encrypt_key(const Private_Key& key, encode(key, raw_key, RAW_BER); raw_key.end_msg(); - std::auto_ptr<PBE> pbe(get_pbe(((pbe_algo != "") ? pbe_algo : DEFAULT_PBE))); + std::unique_ptr<PBE> pbe(get_pbe(((pbe_algo != "") ? pbe_algo : DEFAULT_PBE))); pbe->new_params(rng); pbe->set_key(pass); |