propagate from branch 'net.randombit.botan' (head ac888e57b614c623590d79ab615353ad7c76ef68)

            to branch 'net.randombit.botan.c++0x' (head 9bf78ed7e2521a328f6db7acbc1cd81b07718230)

1 files changed, 3 insertions, 1 deletions

diff --git a/src/cert/x509/x509self.cpp b/src/cert/x509/x509self.cpp
index 598d6a418..8db2f37a6 100644
--- a/src/cert/x509/x509self.cpp
+++ b/src/cert/x509/x509self.cpp
@@ -65,6 +65,7 @@ namespace X509 {
 */
 X509_Certificate create_self_signed_cert(const X509_Cert_Options& opts,
                                          const Private_Key& key,
+                                         const std::string& hash_fn,
                                          RandomNumberGenerator& rng)
    {
    AlgorithmIdentifier sig_algo;
@@ -103,6 +104,7 @@ X509_Certificate create_self_signed_cert(const X509_Cert_Options& opts,
 */
 PKCS10_Request create_cert_req(const X509_Cert_Options& opts,
                                const Private_Key& key,
+                               const std::string& hash_fn,
                                RandomNumberGenerator& rng)
    {
    AlgorithmIdentifier sig_algo;
@@ -110,7 +112,7 @@ PKCS10_Request create_cert_req(const X509_Cert_Options& opts,
    AlternativeName subject_alt;
 
    MemoryVector<byte> pub_key = shared_setup(opts, key);
-   std::unique_ptr<PK_Signer> signer(choose_sig_format(key, sig_algo));
+   std::unique_ptr<PK_Signer> signer(choose_sig_format(key, hash_fn, sig_algo));
    load_info(opts, subject_dn, subject_alt);
 
    const u32bit PKCS10_VERSION = 0;