The unified diff between revisions [75daca8d..] and [08eaf28d..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'pkcs8.h'

#
#
# patch "pkcs8.h"
#  from [6297b138d32d7a8c931bd9532c70b89d11bc3f1b]
#    to [053e299f32c788f89090fc7aa8ced0e10adfac58]
#
============================================================
--- pkcs8.h	6297b138d32d7a8c931bd9532c70b89d11bc3f1b
+++ pkcs8.h	053e299f32c788f89090fc7aa8ced0e10adfac58
@@ -44,11 +44,15 @@ std::string PEM_encode(const PKCS8_Priva
 std::string PEM_encode(const PKCS8_PrivateKey&, const std::string&,
                        const std::string& = "");

-PKCS8_PrivateKey* load_key(DataSource&, const User_Interface&);
-PKCS8_PrivateKey* load_key(DataSource&, const std::string& = "");
+PKCS8_PrivateKey* load_key(DataSource&, const User_Interface&,
+                           bool encrypted = true);
+PKCS8_PrivateKey* load_key(DataSource&, const std::string& = "",
+                           bool encrypted = true);

-PKCS8_PrivateKey* load_key(const std::string&, const User_Interface&);
-PKCS8_PrivateKey* load_key(const std::string&, const std::string& = "");
+PKCS8_PrivateKey* load_key(const std::string&, const User_Interface&,
+                           bool encrypted = true);
+PKCS8_PrivateKey* load_key(const std::string&, const std::string& = "",
+                           bool encrypted = true);

 PKCS8_PrivateKey* copy_key(const PKCS8_PrivateKey&);