diff options
| -rw-r--r-- | doc/log.txt | 5 | ||||
| -rw-r--r-- | src/pubkey/pkcs8.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/log.txt b/doc/log.txt index fd5b28645..f9092da21 100644 --- a/doc/log.txt +++ b/doc/log.txt @@ -1,4 +1,7 @@ +* 1.9.11-dev, ????-??-?? + - Switch default PKCS #8 encryption algorithm from AES-128 to AES-256 + * 1.9.10, 2010-08-12 - Add a constant time AES implementation using SSSE3 - Add support for loading new Engines at runtime @@ -87,7 +90,7 @@ - Fix an invalid memory read in MD4 - Fix Visual C++ static builds - Remove Timer class entirely - - Switch default PKCS #8 encryption algorithm from 3DES to AES-256 + - Switch default PKCS #8 encryption algorithm from 3DES to AES-128 - New option --gen-amalgamation for creating a SQLite-style amalgamation - Many headers are now explicitly internal-use-only and are not installed - Greatly improve the Win32 installer diff --git a/src/pubkey/pkcs8.cpp b/src/pubkey/pkcs8.cpp index 3c767959f..5eed776be 100644 --- a/src/pubkey/pkcs8.cpp +++ b/src/pubkey/pkcs8.cpp @@ -160,7 +160,7 @@ SecureVector<byte> BER_encode(const Private_Key& key, const std::string& pass, const std::string& pbe_algo) { - const std::string DEFAULT_PBE = "PBE-PKCS5v20(SHA-1,AES-128/CBC)"; + const std::string DEFAULT_PBE = "PBE-PKCS5v20(SHA-1,AES-256/CBC)"; std::auto_ptr<PBE> pbe(get_pbe(((pbe_algo != "") ? pbe_algo : DEFAULT_PBE))); |