Remove workaround for missing symbols in PQClean

Now that the upstream issue has been fixed, we can remove the workaround
for the missing ML-DSA symbols.

Refs: PQClean/PQClean#576

Author: tniessen

scripts/build-wasm.mjs

@@ -76,53 +76,7 @@ const commonSourceFiles = await sources('common', (name) => name !== 'randombyte
 const kemSourceFiles = (await Promise.all(kemNames.map((kem) => sources(`crypto_kem/${kem}/clean`)))).flat();
 const signSourceFiles = (await Promise.all(signNames.map((sign) => sources(`crypto_sign/${sign}/clean`)))).flat();
 
-const wrapperCode = `// Some implementations do not provide certain functions as symbols but only as
-// macros with parameters, which we cannot export. Implement symbols here.
-
-${signNames.map((sign) => `#include "../../${depDir}/crypto_sign/${sign}/clean/api.h"`).join('\n')}
-
-${functions(signNames, 'sign', 'signature').map((fn) => `#ifdef ${fn}
-static inline int _fn_symbol_${fn}(uint8_t *sig, size_t *siglen, const uint8_t *m, size_t mlen, const uint8_t *sk) {
-  return ${fn}(sig, siglen, m, mlen, sk);
-}
-#undef ${fn}
-int ${fn}(uint8_t *sig, size_t *siglen, const uint8_t *m, size_t mlen, const uint8_t *sk) {
-  return _fn_symbol_${fn}(sig, siglen, m, mlen, sk);
-}
-#endif`).join('\n')}
-${functions(signNames, 'sign', 'sign').map((fn) => `#ifdef ${fn}
-static inline int _fn_symbol_${fn}(uint8_t *sig, size_t *siglen, const uint8_t *m, size_t mlen, const uint8_t *sk) {
-  return ${fn}(sig, siglen, m, mlen, sk);
-}
-#undef ${fn}
-int ${fn}(uint8_t *sig, size_t *siglen, const uint8_t *m, size_t mlen, const uint8_t *sk) {
-  return _fn_symbol_${fn}(sig, siglen, m, mlen, sk);
-}
-#endif`).join('\n')}
-${functions(signNames, 'sign', 'verify').map((fn) => `#ifdef ${fn}
-static inline int _fn_symbol_${fn}(const uint8_t *sig, size_t siglen, const uint8_t *m, size_t mlen, const uint8_t *pk) {
-  return ${fn}(sig, siglen, m, mlen, pk);
-}
-#undef ${fn}
-int ${fn}(const uint8_t *sig, size_t siglen, const uint8_t *m, size_t mlen, const uint8_t *pk) {
-  return _fn_symbol_${fn}(sig, siglen, m, mlen, pk);
-}
-#endif
-`).join('\n')}
-${functions(signNames, 'sign', 'open').map((fn) => `#ifdef ${fn}
-static inline int _fn_symbol_${fn}(uint8_t *sig, size_t *siglen, const uint8_t *m, size_t mlen, const uint8_t *sk) {
-  return ${fn}(sig, siglen, m, mlen, sk);
-}
-#undef ${fn}
-int ${fn}(uint8_t *sig, size_t *siglen, const uint8_t *m, size_t mlen, const uint8_t *sk) {
-  return _fn_symbol_${fn}(sig, siglen, m, mlen, sk);
-}
-#endif`).join('\n')}
-`;
-
-await writeFile(`${buildDir}/missing-symbols.c`, wrapperCode);
-
-console.log(`Compiling ${commonSourceFiles.length} common source files, ${kemSourceFiles.length} KEM source files, ${signSourceFiles.length} sign source files, and missing symbols`);
+console.log(`Compiling ${commonSourceFiles.length} common source files, ${kemSourceFiles.length} KEM source files, ${signSourceFiles.length} sign source files`);
 
 const proc = spawn('emcc', [
   '-std=c11',
@@ -142,7 +96,6 @@ const proc = spawn('emcc', [
   ...commonSourceFiles,
   ...kemSourceFiles,
   ...signSourceFiles,
-  `${buildDir}/missing-symbols.c`,
 ], {
   stdio: 'inherit'
 });
@@ -151,7 +104,5 @@ if (code !== 0) {
   throw new Error(`emcc exited with ${code !== null ? `code ${code}` : `signal ${signal}`}`);
 }
 
-await unlink(`${buildDir}/missing-symbols.c`);
-
 const { size } = await stat(`${buildDir}/pqclean.wasm`);
 console.log(`WebAssembly module size is ${(size / 1024).toFixed(1)} KiB`);

scripts/regenerate-native.mjs

@@ -113,31 +113,6 @@ namespace sign {
 
 constexpr unsigned int N_ALGORITHMS = ${nSignImpls};
 
-// Some implementations do not provide certain functions as symbols but only as
-// macros with parameters, which we cannot use as function pointers directly.
-namespace {
-${signImpls.map((impl) => `#ifdef PQCLEAN_${id(impl)}_CLEAN_crypto_sign_signature
-inline int _fn_symbol_PQCLEAN_${id(impl)}_CLEAN_crypto_sign_signature(uint8_t* sig, size_t* siglen, const uint8_t* m, size_t mlen, const uint8_t* sk) {
-  return PQCLEAN_${id(impl)}_CLEAN_crypto_sign_signature(sig, siglen, m, mlen, sk);
-}
-#endif
-#ifdef PQCLEAN_${id(impl)}_CLEAN_crypto_sign
-inline int _fn_symbol_PQCLEAN_${id(impl)}_CLEAN_crypto_sign(uint8_t* sm, size_t* smlen, const uint8_t* m, size_t mlen, const uint8_t* sk) {
-  return PQCLEAN_${id(impl)}_CLEAN_crypto_sign(sm, smlen, m, mlen, sk);
-}
-#endif
-#ifdef PQCLEAN_${id(impl)}_CLEAN_crypto_sign_verify
-inline int _fn_symbol_PQCLEAN_${id(impl)}_CLEAN_crypto_sign_verify(const uint8_t* sig, size_t siglen, const uint8_t* m, size_t mlen, const uint8_t* pk) {
-  return PQCLEAN_${id(impl)}_CLEAN_crypto_sign_verify(sig, siglen, m, mlen, pk);
-}
-#endif
-#ifdef PQCLEAN_${id(impl)}_CLEAN_crypto_sign_open
-inline int _fn_symbol_PQCLEAN_${id(impl)}_CLEAN_crypto_sign_open(uint8_t* m, size_t* mlen, const uint8_t* sm, size_t smlen, const uint8_t* pk) {
-  return PQCLEAN_${id(impl)}_CLEAN_crypto_sign_open(m, mlen, sm, smlen, pk);
-}
-#endif`).join('\n')}
-}
-
 const std::array<Algorithm, N_ALGORITHMS>& algorithms() {
   static const std::array<Algorithm, N_ALGORITHMS> all = {{
 ${signImpls.map((impl) => `    {
@@ -152,26 +127,10 @@ ${signImpls.map((impl) => `    {
       0,
 #endif
       PQCLEAN_${id(impl)}_CLEAN_crypto_sign_keypair,
-#ifndef PQCLEAN_${id(impl)}_CLEAN_crypto_sign_signature
       PQCLEAN_${id(impl)}_CLEAN_crypto_sign_signature,
-#else
-      _fn_symbol_PQCLEAN_${id(impl)}_CLEAN_crypto_sign_signature,
-#endif
-#ifndef PQCLEAN_${id(impl)}_CLEAN_crypto_sign
       PQCLEAN_${id(impl)}_CLEAN_crypto_sign,
-#else
-      _fn_symbol_PQCLEAN_${id(impl)}_CLEAN_crypto_sign,
-#endif
-#ifndef PQCLEAN_${id(impl)}_CLEAN_crypto_sign_verify
       PQCLEAN_${id(impl)}_CLEAN_crypto_sign_verify,
-#else
-      _fn_symbol_PQCLEAN_${id(impl)}_CLEAN_crypto_sign_verify,
-#endif
-#ifndef PQCLEAN_${id(impl)}_CLEAN_crypto_sign_open
       PQCLEAN_${id(impl)}_CLEAN_crypto_sign_open
-#else
-      _fn_symbol_PQCLEAN_${id(impl)}_CLEAN_crypto_sign_open
-#endif
     },`).join('\n')}
   }};
   return all;