PCT: simplify code

Signed-off-by: Stephan Mueller <smueller@chronox.de>

Author: smuellerDD

ml-dsa/src/dilithium_api.c

@@ -28,8 +28,7 @@
 #include "ext_headers.h"
 #include "dilithium_helper.h"
 #include "lc_dilithium.h"
-#include "small_stack_support.h"
-#include "ret_checkers.h"
+#include "dilithium_pct.h"
 #include "visibility.h"
 
 LC_INTERFACE_FUNCTION(int, lc_dilithium_ctx_alloc,
@@ -524,20 +523,7 @@ LC_INTERFACE_FUNCTION(int, lc_dilithium_keypair_from_seed,
 LC_INTERFACE_FUNCTION(int, lc_dilithium_pct, const struct lc_dilithium_pk *pk,
 		      const struct lc_dilithium_sk *sk)
 {
-	struct workspace {
-		uint8_t m[32];
-		struct lc_dilithium_sig sig;
-	};
-	int ret;
-	LC_DECLARE_MEM(ws, struct workspace, sizeof(uint64_t));
-
-	CKINT(lc_dilithium_sign(&ws->sig, ws->m, sizeof(ws->m), sk,
-				lc_seeded_rng));
-	CKINT(lc_dilithium_verify(&ws->sig, ws->m, sizeof(ws->m), pk));
-
-out:
-	LC_RELEASE_MEM(ws);
-	return ret;
+	return _lc_dilithium_pct_fips(pk, sk);
 }
 
 LC_INTERFACE_FUNCTION(int, lc_dilithium_sign, struct lc_dilithium_sig *sig,

ml-dsa/src/dilithium_pct.h

@@ -20,7 +20,6 @@
 #ifndef DILITHIUM_PCT_H
 #define DILITHIUM_PCT_H
 
-#include "dilithium_type.h"
 #include "ret_checkers.h"
 #include "small_stack_support.h"
 #include "visibility.h"

ml-kem/src/kyber_pct.h

@@ -17,13 +17,19 @@
  * DAMAGE.
  */
 
-#include "kyber_type.h"
+#ifndef KYBER_PCT_H
+#define KYBER_PCT_H
+
 #include "lc_memcmp_secure.h"
 #include "small_stack_support.h"
 #include "ret_checkers.h"
 #include "timecop.h"
 #include "visibility.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 static inline int _lc_kyber_pct_fips(const struct lc_kyber_pk *pk,
 				     const struct lc_kyber_sk *sk)
 {
@@ -73,3 +79,9 @@ static inline int lc_kyber_pct_fips(const struct lc_kyber_pk *pk,
 	return 0;
 #endif
 }
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* KYBER_PCT_H */

slh-dsa/src/sphincs_api.c

@@ -18,8 +18,7 @@
  */
 
 #include "lc_sphincs.h"
-#include "small_stack_support.h"
-#include "ret_checkers.h"
+#include "sphincs_pct.h"
 #include "visibility.h"
 
 LC_INTERFACE_FUNCTION(int, lc_sphincs_ctx_alloc, struct lc_sphincs_ctx **ctx)
@@ -911,20 +910,7 @@ LC_INTERFACE_FUNCTION(int, lc_sphincs_keypair_from_seed,
 LC_INTERFACE_FUNCTION(int, lc_sphincs_pct, const struct lc_sphincs_pk *pk,
 		      const struct lc_sphincs_sk *sk)
 {
-	struct workspace {
-		uint8_t m[32];
-		struct lc_sphincs_sig sig;
-	};
-	int ret;
-	LC_DECLARE_MEM(ws, struct workspace, sizeof(uint64_t));
-
-	CKINT(lc_sphincs_sign(&ws->sig, ws->m, sizeof(ws->m), sk,
-			      lc_seeded_rng));
-	CKINT(lc_sphincs_verify(&ws->sig, ws->m, sizeof(ws->m), pk));
-
-out:
-	LC_RELEASE_MEM(ws);
-	return ret;
+	return _lc_sphincs_pct_fips(pk, sk);
 }
 
 LC_INTERFACE_FUNCTION(int, lc_sphincs_sign, struct lc_sphincs_sig *sig,

slh-dsa/src/sphincs_pct.h

@@ -20,7 +20,6 @@
 #ifndef SPHINCS_PCT_H
 #define SPHINCS_PCT_H
 
-#include "sphincs_type.h"
 #include "ret_checkers.h"
 #include "small_stack_support.h"
 #include "visibility.h"