reintroduce old api (HsmKeyParams) struct based and exposed functions

src/key.cpp

@@ -245,6 +245,27 @@ AsymmetricKeypair AsymmetricKeypair::generateKeyOnHSM(HSM &hsm,
     }
 }
 
+AsymmetricKeypair AsymmetricKeypair::generateKeyOnHSM(HSM &hsm,
+                                                      const RSASpec &spec,
+                                                      const std::string &keyLabel,
+                                                      const std::vector<uint8_t> &keyID,
+                                                      const HsmKeyParams &params)
+{
+    // libp11 uses 128 byte buffer
+    if (keyID.size() >= 64) {
+        throw MoCOCrWException("Invalid keyID - key longer than 63 bytes");
+    }
+    try {
+        HsmKeyParameters parameters = HsmKeyParameters::Builder{}.setExtractable(params.cka_extractable).build();
+        return AsymmetricKeypair{hsm.generateKey(spec, keyLabel, keyID, parameters)};
+    } catch (const openssl::OpenSSLException &e) {
+        throw MoCOCrWException(
+                // wrong token-label? using unsupported ECC curve? HSM module implementation?
+                std::string("Key generation failed for unknown reason. OpenSSL error: ") +
+                e.what());
+    }
+}
+
 AsymmetricKeypair AsymmetricKeypair::generateKeyOnHSM(HSM &hsm,
                                                       const ECCSpec &spec,
                                                       const std::string &keyLabel,
@@ -283,6 +304,28 @@ AsymmetricKeypair AsymmetricKeypair::generateKeyOnHSM(HSM &hsm,
                 e.what());
     }
 }
+
+AsymmetricKeypair AsymmetricKeypair::generateKeyOnHSM(HSM &hsm,
+                                                      const ECCSpec &spec,
+                                                      const std::string &keyLabel,
+                                                      const std::vector<uint8_t> &keyID,
+                                                      const HsmKeyParams &params)
+{
+    // libp11 uses 128 byte buffer
+    if (keyID.size() >= 64) {
+        throw MoCOCrWException("Invalid keyID - key longer than 63 bytes");
+    }
+    try {
+        HsmKeyParameters parameters = HsmKeyParameters::Builder{}.setExtractable(params.cka_extractable).build();
+        return AsymmetricKeypair{hsm.generateKey(spec, keyLabel, keyID, parameters)};
+    } catch (const openssl::OpenSSLException &e) {
+        throw MoCOCrWException(
+                // wrong token-label? using unsupported ECC curve? HSM module implementation?
+                std::string("Key generation failed for unknown reason. OpenSSL error: ") +
+                e.what());
+    }
+}
+
 #endif
 
 AsymmetricKey RSASpec::generate() const

src/mococrw/hsm.h

@@ -26,7 +26,12 @@ class ECCSpec;
 class RSASpec;
 
 
-
+// Needed for old deprecated API
+struct HsmKeyParams
+{
+    bool cka_extractable = false;
+    bool cka_sensitive = true;
+};
 
 /**
  * This class currently contains PKCS#11 attributes which are changeable on key creation.

src/mococrw/key.h

@@ -341,6 +341,27 @@ class AsymmetricKeypair : public AsymmetricPublicKey
                                               const std::vector<uint8_t> &keyID,
                                               const HsmKeyParameters &params);
 
+    /** Deprecated func
+     * @brief Generates RSA keypair on HSM token according to the spec given.
+     * @note PKCS#11 standard has no rule to avoid having keys with duplicate labels and/or ids.
+     * Therefore care should be taken when generating keys with other tools on the same token.
+     * @param hsm HSM engine handle
+     * @param spec @ref RSASpec
+     * @param keyLabel String based description of an object on the token. It
+     * can be used in combination with keyID to identify an object.
+     * @param keyID raw bytes based key identifer
+     * @param Struct to set key generation attributes
+     * @return AsymmetricKeypair @ref AsymmetricKeypair
+     * @throw MoCOCrWException Since most of the logic is happening outside of OpenSSL and inside
+     * libp11 and HSM module implementation, we can't know exactly what went wrong. libp11 does log
+     * some things to stderr, check if there's more context there
+     */
+    static AsymmetricKeypair generateKeyOnHSM(HSM &hsm,
+                                              const RSASpec &spec,
+                                              const std::string &keyLabel,
+                                              const std::vector<uint8_t> &keyID,
+                                              const HsmKeyParams &params);
+
     /**
      * @brief Generates ECC keypair on HSM token according to the spec given.
      * @note PKCS#11 standard has no rule to avoid having keys with duplicate labels and/or ids.
@@ -380,6 +401,27 @@ class AsymmetricKeypair : public AsymmetricPublicKey
                                               const std::string &keyLabel,
                                               const std::vector<uint8_t> &keyID,
                                               const HsmKeyParameters &params);
+
+    /** Deprecated func
+     * @brief Generates ECC keypair on HSM token according to the spec given.
+     * @note PKCS#11 standard has no rule to avoid having keys with duplicate labels and/or ids.
+     * Therefore care should be taken when generating keys with other tools on the same token.
+     * @param hsm HSM engine handle
+     * @param spec @ref ECCSpec
+     * @param keyLabel String based description of an object on the token. It
+     * can be used in combination with keyID to identify an object.
+     * @param keyID raw bytes based key identifer
+     * @param Struct to set key generation attributes
+     * @return AsymmetricKeypair @ref AsymmetricKeypair
+     * @throw MoCOCrWException Since most of the logic is happening outside of OpenSSL and inside
+     * libp11 and HSM module implementation, we can't know exactly what went wrong. libp11 does log
+     * some things to stderr, check if there's more context there
+     */
+    static AsymmetricKeypair generateKeyOnHSM(HSM &hsm,
+                                              const ECCSpec &spec,
+                                              const std::string &keyLabel,
+                                              const std::vector<uint8_t> &keyID,
+                                              const HsmKeyParams &params);
 #endif
 
 private: