Skip to content

check a return value of *Deserialize #6

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

Merged
merged 4 commits into from
Dec 11, 2017
Merged

check a return value of *Deserialize #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d52efb
check a return value of *Deserialize
herumi Dec 10, 2017
786bbae
fix comparision by lint
herumi Dec 10, 2017
c0a8e75
add test of bad import
herumi Dec 10, 2017
362393e
remove duplicated code
herumi Dec 11, 2017
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
2 changes: 1 addition & 1 deletion bls
Open in desktop
Submodule bls updated 13 files
+4 −13 Makefile
+0 −217 docs/demo/bls-demo.js
+0 −66 docs/demo/bls.html
+0 −405 docs/demo/bls.js
+0 −14 docs/demo/bls_c.js
+ − docs/demo/bls_c.wasm
+0 −6 docs/demo/style.css
+0 −141 docs/index.html
+0 −5 ffi/js/pre.js
+39 −35 include/bls/bls.h
+3 −2 readme.md
+38 −38 src/bls_c.cpp
+60 −0 test/bls_c384_test.cpp
2 changes: 1 addition & 1 deletion build/bls_lib.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified build/bls_lib.wasm
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion build/build.ninja
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cflags = -I../mcl/include/ -I../cybozulib/include -I../bls/include -I../bls

rule buildExLib
command = emcc -O3 -o $out ../bls/src/bls_c.cpp ../mcl/src/fp.cpp --pre-js ../pre.js $cflags -s WASM=1 -DMCLBN_FP_UNIT_SIZE=6 -DMCL_MAX_BIT_SIZE=384 -DNDEBUG
command = emcc -O3 -o $out ../bls/src/bls_c.cpp ../mcl/src/fp.cpp --pre-js ../pre.js $cflags -s WASM=1 -DMCLBN_FP_UNIT_SIZE=6 -DMCL_MAX_BIT_SIZE=384 -DNDEBUG -DMCLBN_USE_NEW_DESERIALIZE_API

build bls_lib.js : buildExLib
16 changes: 13 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ mod.onRuntimeInitialized = function () {
* @param {number} sk - a pointer to a secret key
* @param {TypedArray} array - the secret key as a 32 byte TypedArray
*/
exports.secretKeyDeserialize = wrapInput(mod._blsSecretKeyDeserialize)
exports.secretKeyDeserialize = wrapDeserialize(mod._blsSecretKeyDeserialize)

/**
* write a secretKey to memory and returns a pointer to it
Expand All @@ -195,7 +195,7 @@ mod.onRuntimeInitialized = function () {
* @param {number} sk - a pointer to a public key
* @param {TypedArray} array - the secret key as a 64 byte TypedArray
*/
exports.publicKeyDeserialize = wrapInput(mod._blsPublicKeyDeserialize)
exports.publicKeyDeserialize = wrapDeserialize(mod._blsPublicKeyDeserialize)

/**
* write a publicKey to memory and returns a pointer to it
Expand All @@ -213,7 +213,7 @@ mod.onRuntimeInitialized = function () {
* @param {number} sig - a pointer to a signature
* @param {TypedArray} array - the signature as a 32 byte TypedArray
*/
exports.signatureDeserialize = wrapInput(mod._blsSignatureDeserialize)
exports.signatureDeserialize = wrapDeserialize(mod._blsSignatureDeserialize)

/**
* write a signature to memory and returns a pointer to it
Expand Down Expand Up @@ -334,6 +334,16 @@ function wrapInput (func) {
}
}

function wrapDeserialize (func) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this replicates a bit of what is in wrapInput maybe we could use something like this instead

function wrapDeserialize (func) {
  func = wrapInput(func)
  return function () {
    const r = func.apply(null, arguments)
    if (r === 0) {
      throw new Error('Deserialize err')
    }
  }
}

what do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right. I fixed it.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

awesome! looking good 👍

func = wrapInput(func)
return function (p, buf) {
const r = func(p, buf)
if (r === 0) {
throw new Error('Deserialize err')
}
}
}

function wrapOutput (func, size) {
return function (x) {
const pos = mod._malloc(size)
Expand Down
2 changes: 1 addition & 1 deletion mcl
Open in desktop
Submodule mcl updated 32 files
+7 −27 Makefile
+0 −54 docs/demo/ibe-demo.js
+0 −27 docs/demo/ibe.html
+0 −66 docs/demo/index.html
+0 −149 docs/demo/index.js
+0 −4 docs/demo/jquery-3.2.1.min.js
+0 −570 docs/demo/mcl.js
+0 −14 docs/demo/mcl_c.js
+ − docs/demo/mcl_c.wasm
+0 −66 docs/demo/mobile.css
+0 −147 docs/demo/she-demo.js
+0 −105 docs/demo/she-demo2.js
+0 −41 docs/demo/she.html
+0 −534 docs/demo/she.js
+0 −55 docs/demo/she2.html
+0 −14 docs/demo/she_c.js
+ − docs/demo/she_c.wasm
+0 −68 docs/demo/style.css
+0 −10 docs/index.html
+0 −5 ffi/js/pre.js
+0 −1 ffi/js/she-re.txt
+44 −31 include/mcl/bn.h
+46 −0 include/mcl/ec.hpp
+20 −0 include/mcl/fp.hpp
+82 −0 include/mcl/fp_tower.hpp
+25 −35 include/mcl/she.h
+44 −0 include/mcl/she.hpp
+3 −3 readme.md
+81 −54 src/bn_c_impl.hpp
+56 −102 src/she_c_impl.hpp
+36 −0 test/bn_c_test.hpp
+8 −8 test/she_c_test.hpp
11 changes: 11 additions & 0 deletions tests/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,17 @@ bls.onModuleInit(() => {
t.end()
})

tape('bad import', t => {
bls.init()
t.plan(1)
try {
bls.secretKeyImport(new Uint8Array([1, 2, 3]))
} catch (e) {
t.pass(true)
}
t.end()
})

tape('shares', t => {
bls.init()
const numOfPlayers = 5
Expand Down