fix some warnings and one compile error

4 files changed, 7 insertions, 6 deletions

diff --git a/src/lib/prov/pkcs11/p11_ecc_key.cpp b/src/lib/prov/pkcs11/p11_ecc_key.cpp
index 4382b8c2b..0c3e879d9 100644
--- a/src/lib/prov/pkcs11/p11_ecc_key.cpp
+++ b/src/lib/prov/pkcs11/p11_ecc_key.cpp
@@ -40,7 +40,7 @@ EC_PublicKeyImportProperties::EC_PublicKeyImportProperties(const std::vector<byt
    }
 
 PKCS11_EC_PublicKey::PKCS11_EC_PublicKey(Session& session, ObjectHandle handle)
-   : EC_PublicKey(), Object(session, handle)
+   : Object(session, handle)
    {
    secure_vector<byte> ec_parameters = get_attribute_value(AttributeType::EcParams);
    m_domain_params = EC_Group(unlock(ec_parameters));
diff --git a/src/lib/prov/pkcs11/p11_ecdh.h b/src/lib/prov/pkcs11/p11_ecdh.h
index 9a73be1c5..749a00d52 100644
--- a/src/lib/prov/pkcs11/p11_ecdh.h
+++ b/src/lib/prov/pkcs11/p11_ecdh.h
@@ -33,7 +33,7 @@ class BOTAN_DLL PKCS11_ECDH_PublicKey final : public PKCS11_EC_PublicKey
       * @param handle the handle of the ECDH public key
       */
       PKCS11_ECDH_PublicKey(Session& session, ObjectHandle handle)
-         : PKCS11_EC_PublicKey(session, handle)
+         : EC_PublicKey(), PKCS11_EC_PublicKey(session, handle)
          {}
 
       /**
@@ -42,7 +42,7 @@ class BOTAN_DLL PKCS11_ECDH_PublicKey final : public PKCS11_EC_PublicKey
       * @param props the attributes of the public key
       */
       PKCS11_ECDH_PublicKey(Session& session, const EC_PublicKeyImportProperties& props)
-         : PKCS11_EC_PublicKey(session, props)
+         : EC_PublicKey(), PKCS11_EC_PublicKey(session, props)
          {}
 
       inline std::string algo_name() const override
diff --git a/src/lib/prov/pkcs11/p11_ecdsa.h b/src/lib/prov/pkcs11/p11_ecdsa.h
index 2ac59e028..d3d07a780 100644
--- a/src/lib/prov/pkcs11/p11_ecdsa.h
+++ b/src/lib/prov/pkcs11/p11_ecdsa.h
@@ -31,7 +31,7 @@ class BOTAN_DLL PKCS11_ECDSA_PublicKey final : public PKCS11_EC_PublicKey, publi
       * @param handle the handle of the ECDSA public key
       */
       PKCS11_ECDSA_PublicKey(Session& session, ObjectHandle handle)
-         : PKCS11_EC_PublicKey(session, handle)
+         : EC_PublicKey(), PKCS11_EC_PublicKey(session, handle)
          {}
 
       /**
@@ -40,7 +40,7 @@ class BOTAN_DLL PKCS11_ECDSA_PublicKey final : public PKCS11_EC_PublicKey, publi
       * @param props the attributes of the public key
       */
       PKCS11_ECDSA_PublicKey(Session& session, const EC_PublicKeyImportProperties& props)
-         : PKCS11_EC_PublicKey(session, props)
+         : EC_PublicKey(), PKCS11_EC_PublicKey(session, props)
          {}
 
       inline std::string algo_name() const override
diff --git a/src/lib/prov/pkcs11/p11_mechanism.cpp b/src/lib/prov/pkcs11/p11_mechanism.cpp
index b3cc1c83b..299f211c3 100644
--- a/src/lib/prov/pkcs11/p11_mechanism.cpp
+++ b/src/lib/prov/pkcs11/p11_mechanism.cpp
@@ -9,6 +9,7 @@
 #include <botan/internal/p11_mechanism.h>
 #include <botan/rfc6979.h>
 #include <botan/scan_name.h>
+#include <botan/emsa.h>
 
 #include <tuple>
 
@@ -208,7 +209,7 @@ MechanismWrapper MechanismWrapper::create_ecdsa_mechanism(const std::string& has
 
    if(hash_name != "Raw")
       {
-      hash_name = hash_for_deterministic_signature(hash);
+      hash_name = hash_for_emsa(hash);
       }
 
    auto mechanism_type = EcdsaHash.find(hash_name);