Convert pkcs8_decoder() and x509_decoder() to take a RandomNumberGenerator&

reference, along with PKCS8::load_key

get_pbe no longer calls new_params() on the newly instantiated instance,
which is not backwards compatible (you have to either call new_params
yourself, or explicitly set the iteration count, salt, etc)

1 files changed, 4 insertions, 1 deletions

diff --git a/src/x509_key.cpp b/src/x509_key.cpp
index 09044d492..f327aac16 100644
--- a/src/x509_key.cpp
+++ b/src/x509_key.cpp
@@ -11,6 +11,7 @@
 #include <botan/pk_algs.h>
 #include <botan/oids.h>
 #include <botan/pem.h>
+#include <botan/libstate.h>
 #include <memory>
 
 namespace Botan {
@@ -97,7 +98,9 @@ Public_Key* load_key(DataSource& source)
          throw Decoding_Error("Unknown PK algorithm/OID: " + alg_name + ", " +
                               alg_id.oid.as_string());
 
-      std::auto_ptr<X509_Decoder> decoder(key_obj->x509_decoder());
+      std::auto_ptr<X509_Decoder> decoder(
+         key_obj->x509_decoder(global_state().prng_reference()));
+
       if(!decoder.get())
          throw Decoding_Error("Key does not support X.509 decoding");