Applied CodeRabbit AI suggestions

Author: Antoine Lochet

m4/acx_botan_mldsa.m4

@@ -185,13 +185,9 @@ AC_DEFUN([ACX_CRYPTO_BACKEND],[
 			detect-*) enable_eddsa="${have_lib_botan_eddsa_support}";;
 		esac
 
-		case "${enable_mldsa}" in
-			yes|detect) ACX_BOTAN_MLDSA;;
-		esac
-		case "${enable_mldsa}-${have_lib_botan_mldsa_support}" in
-			yes-no) AC_MSG_ERROR([Botan library has no ML-DSA support]);;
-			detect-*) enable_mldsa="${have_lib_botan_mldsa_support}";;
-		esac
+		if test	"x${enable_mldsa}" = "xyes"; then
+            AC_MSG_ERROR([Botan does not support ML-DSA])
+        fi
 
 		case "${enable_gost}" in
 			yes|detect) ACX_BOTAN_GOST;;

m4/acx_crypto_backend.m4

@@ -37,6 +37,27 @@ OSSLMLDSAPublicKey::~OSSLMLDSAPublicKey()
 	}
 }
 
+OSSLMLDSAPublicKey::OSSLMLDSAPublicKey(OSSLMLDSAPublicKey&& other) noexcept
+    : MLDSAPublicKey(std::move(other)), pkey(other.pkey)
+{
+    other.pkey = NULL;
+}
+
+OSSLMLDSAPublicKey& OSSLMLDSAPublicKey::operator=(OSSLMLDSAPublicKey&& other) noexcept
+{
+    if (this != &other)
+    {
+        // move base
+        MLDSAPublicKey::operator=(std::move(other));
+        // release current
+        if (pkey) { EVP_PKEY_free(pkey); }
+        // steal
+        pkey = other.pkey;
+        other.pkey = NULL;
+    }
+    return *this;
+}
+
 // The type
 /*static*/ const char* OSSLMLDSAPublicKey::type = "OpenSSL ML-DSA Public Key";
 

src/lib/crypto/OSSLMLDSAPublicKey.cpp

@@ -23,6 +23,14 @@ class OSSLMLDSAPublicKey : public MLDSAPublicKey
 	// Destructor
 	virtual ~OSSLMLDSAPublicKey();
 
+	// Non-copyable (raw ownership of EVP_PKEY)
+    OSSLMLDSAPublicKey(const OSSLMLDSAPublicKey&) = delete;
+    OSSLMLDSAPublicKey& operator=(const OSSLMLDSAPublicKey&) = delete;
+
+	// Movable
+	OSSLMLDSAPublicKey(OSSLMLDSAPublicKey&&) noexcept;
+	OSSLMLDSAPublicKey& operator=(OSSLMLDSAPublicKey&&) noexcept;
+
 	// The type
 	static const char* type;
 

src/lib/crypto/OSSLMLDSAPublicKey.h

@@ -34,8 +34,10 @@
 #include "log.h"
 #include "DerUtil.h"
 #include "OSSLUtil.h"
+#ifdef WITH_ML_DSA
 #include "MLDSAParameters.h"
 #include <map>
+#endif
 #include <openssl/asn1.h>
 #include <openssl/evp.h>
 #include <openssl/err.h>

src/lib/crypto/OSSLUtil.cpp

@@ -520,6 +520,7 @@ static AttributeKind attributeKind(CK_ATTRIBUTE_TYPE type)
 	case CKA_OS_USERPIN: return akBinary;
 
 	case CKA_PARAMETER_SET: return akInteger;
+	case CKA_SEED: return akBinary;
 
 	default: return akUnknown;
 	}