Skip to content

Alternative/macos arm ready #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mikescops wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Alternative/macos arm ready #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b97040d
Make the project working for Macos ARM
Jul 30, 2024
9c65015
Add webpack fixed config and pqc supported algos
Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ src/libsodium/
src/PQClean/
src/*asm.js
src/*asm.wasm
bundle/pqc*
bundle/*
!bundle/*.babel.js
22 changes: 11 additions & 11 deletions GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ primitives:
npm run build && \
npm run test:primitives

KEM := firesaber frodokem1344aes frodokem1344shake frodokem640aes frodokem640shake frodokem976aes frodokem976shake hqc-rmrs-128 hqc-rmrs-192 hqc-rmrs-256 kyber1024 kyber1024-90s kyber512 kyber512-90s kyber768 kyber768-90s lightsaber mceliece348864 mceliece348864f mceliece460896 mceliece460896f mceliece6688128 mceliece6688128f mceliece6960119 mceliece6960119f mceliece8192128 mceliece8192128f ntruhps2048509 ntruhps2048677 ntruhps40961229 ntruhps4096821 ntruhrss1373 ntruhrss701 ntrulpr1013 ntrulpr1277 ntrulpr653 ntrulpr761 ntrulpr857 ntrulpr953 saber sntrup1013 sntrup1277 sntrup653 sntrup761 sntrup857 sntrup953
KEM := hqc-128 hqc-192 hqc-256 kyber1024 kyber512 kyber768 mceliece348864 mceliece348864f mceliece460896 mceliece460896f mceliece6688128 mceliece6688128f mceliece6960119 mceliece6960119f mceliece8192128 mceliece8192128f

define make-kem-target
kem-$1:
Expand All @@ -19,15 +19,15 @@ kem-$1:
mkdir package
mkdir -p package/dist
cp package.json README.md package/
sed -i "s/\"name\": \"@dashlane\/pqc.js\",/\"name\": \"@dashlane\/pqc-kem-$1-browser\",/" package/package.json
sed -i "s/\"main\": \"dist\/kem.js\",/\"main\": \"dist\/pqc-kem-$1.js\",/" package/package.json
sed -i "" "s/\"name\": \"@dashlane\/pqc.js\",/\"name\": \"@dashlane\/pqc-kem-$1-browser\",/" package/package.json
sed -i "" "s/\"main\": \"dist\/kem.js\",/\"main\": \"dist\/pqc-kem-$1.js\",/" package/package.json
cp bundle/pqc-kem-$1.* package/dist/
cp dist/kem.d.ts package/dist/
tar zcf docs/bin/pqc-kem-$1/pqc-kem-$1-browser.tgz package/
rm package/dist/pqc-kem-$1.*
cp dist/kem.js dist/kem.asm.js dist/kem.wasm.js dist/kem.wasm.wasm package/dist/
cp package.json package/
sed -i "s/\"name\": \"@dashlane\/pqc.js\",/\"name\": \"@dashlane\/pqc-kem-$1-node\",/" package/package.json
sed -i "" "s/\"name\": \"@dashlane\/pqc.js\",/\"name\": \"@dashlane\/pqc-kem-$1-node\",/" package/package.json
tar zcf docs/bin/pqc-kem-$1/pqc-kem-$1-node.tgz package/
rm -r package/
endef
Expand All @@ -37,7 +37,7 @@ $(foreach element,$(KEM),$(eval $(call make-kem-target,$(element))))
all_kem: $(foreach element,$(KEM),kem-$(element))


SIGN := dilithium2 dilithium2aes dilithium3 dilithium3aes dilithium5 dilithium5aes falcon-1024 falcon-512 rainbowI-circumzenithal rainbowI-classic rainbowI-compressed rainbowIII-circumzenithal rainbowIII-classic rainbowIII-compressed rainbowV-circumzenithal rainbowV-classic rainbowV-compressed sphincs-haraka-128f-robust sphincs-haraka-128f-simple sphincs-haraka-128s-robust sphincs-haraka-128s-simple sphincs-haraka-192f-robust sphincs-haraka-192f-simple sphincs-haraka-192s-robust sphincs-haraka-192s-simple sphincs-haraka-256f-robust sphincs-haraka-256f-simple sphincs-haraka-256s-robust sphincs-haraka-256s-simple sphincs-sha256-128f-robust sphincs-sha256-128f-simple sphincs-sha256-128s-robust sphincs-sha256-128s-simple sphincs-sha256-192f-robust sphincs-sha256-192f-simple sphincs-sha256-192s-robust sphincs-sha256-192s-simple sphincs-sha256-256f-robust sphincs-sha256-256f-simple sphincs-sha256-256s-robust sphincs-sha256-256s-simple sphincs-shake256-128f-robust sphincs-shake256-128f-simple sphincs-shake256-128s-robust sphincs-shake256-128s-simple sphincs-shake256-192f-robust sphincs-shake256-192f-simple sphincs-shake256-192s-robust sphincs-shake256-192s-simple sphincs-shake256-256f-robust sphincs-shake256-256f-simple sphincs-shake256-256s-robust sphincs-shake256-256s-simple
SIGN := dilithium2 dilithium3 dilithium5 falcon-1024 falcon-512 falcon-padded-1024 falcon-padded-512 sphincs-sha2-128f-simple sphincs-sha2-128s-simple sphincs-sha2-192f-simple sphincs-sha2-192s-simple sphincs-sha2-256f-simple sphincs-sha2-256s-simple sphincs-shake-128f-simple sphincs-shake-128s-simple sphincs-shake-192f-simple sphincs-shake-192s-simple sphincs-shake-256f-simple sphincs-shake-256s-simple

define make-sign-target
sign-$1:
Expand All @@ -51,19 +51,19 @@ sign-$1:
mkdir package
mkdir -p package/dist
cp package.json README.md package/
sed -i "s/\"name\": \"@dashlane\/pqc.js\",/\"name\": \"@dashlane\/pqc-sign-$1-browser\",/" package/package.json
sed -i "s/\"main\": \"dist\/kem.js\",/\"main\": \"dist\/pqc-sign-$1.js\",/" package/package.json
sed -i "s/\"types\": \"dist\/kem.d.ts\",/\"types\": \"dist\/sign.d.ts\",/" package/package.json
sed -i "" "s/\"name\": \"@dashlane\/pqc.js\",/\"name\": \"@dashlane\/pqc-sign-$1-browser\",/" package/package.json
sed -i "" "s/\"main\": \"dist\/kem.js\",/\"main\": \"dist\/pqc-sign-$1.js\",/" package/package.json
sed -i "" "s/\"types\": \"dist\/kem.d.ts\",/\"types\": \"dist\/sign.d.ts\",/" package/package.json
cp bundle/pqc-sign-$1.* package/dist/
cp dist/sign.d.ts package/dist/
tar zcf docs/bin/pqc-sign-$1/pqc-sign-$1-browser.tgz package/
cp dist/sign.js package/dist/pqc-sign-$1.js
rm package/dist/pqc-sign-$1.*
cp dist/sign.js dist/sign.asm.js dist/sign.wasm.js dist/sign.wasm.wasm package/dist/
cp package.json package/
sed -i "s/\"name\": \"@dashlane\/pqc.js\",/\"name\": \"@dashlane\/pqc-sign-$1-node\",/" package/package.json
sed -i "s/\"main\": \"dist\/kem.js\",/\"main\": \"dist\/sign.js\",/" package/package.json
sed -i "s/\"types\": \"dist\/kem.d.ts\",/\"types\": \"dist\/sign.d.ts\",/" package/package.json
sed -i "" "s/\"name\": \"@dashlane\/pqc.js\",/\"name\": \"@dashlane\/pqc-sign-$1-node\",/" package/package.json
sed -i "" "s/\"main\": \"dist\/kem.js\",/\"main\": \"dist\/sign.js\",/" package/package.json
sed -i "" "s/\"types\": \"dist\/kem.d.ts\",/\"types\": \"dist\/sign.d.ts\",/" package/package.json
tar zcf docs/bin/pqc-sign-$1/pqc-sign-$1-node.tgz package/
rm -r package/
endef
Expand Down
39 changes: 25 additions & 14 deletions bundle/webpack.config.kem.babel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@ module.exports = (env) => {
}]
},
{
loader: 'string-replace-loader',
options: {
search: 'import.meta.url',
replace: '\'\''
}
},
{
loader: 'string-replace-loader',
options: {
search: 'document.baseURI',
replace: 'undefined'
}
test: /\.js$/,
use: [{
loader: 'string-replace-loader',
options: {
search: 'import.meta.url',
replace: '\'\''
}
}, {
loader: 'string-replace-loader',
options: {
search: 'document.baseURI',
replace: 'undefined'
}
}]
},
// Default WebAssembly loader cannot be used https://github.com/webpack/webpack/issues/15566
{
test: /\.wasm$/,
// Force using legacy assets loader https://github.com/webpack/webpack/issues/6725
type: 'javascript/auto',
loader: 'file-loader',
options: {
Expand All @@ -62,5 +62,16 @@ module.exports = (env) => {
},
],
},
resolve: {
fallback: {
"module": false, // Explicitly handle `module` resolution
"fs": false,
"path": false,
},
extensions: ['.js', '.json', '.wasm'], // Ensure webpack resolves these extensions
},
stats: {
errorDetails: true
}
};
};
11 changes: 11 additions & 0 deletions bundle/webpack.config.sign.babel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,16 @@ module.exports = (env) => {
},
],
},
resolve: {
fallback: {
"module": false, // Explicitly handle `module` resolution
"fs": false,
"path": false,
},
extensions: ['.js', '.json', '.wasm'], // Ensure webpack resolves these extensions
},
stats: {
errorDetails: true
}
};
};
Loading