Skip to content
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

Jump to bottom

Bindings simplification #103

Merged
merged 18 commits into from
Sep 19, 2022
Merged

Bindings simplification #103

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
23c6de8
Replace AsBackend/FromBackend with auto-derived AsRef/From
fjarri Sep 16, 2022
c384fa6
Replace inner() and new() with auto-derived AsRef and From
fjarri Sep 16, 2022
6589cef
Use an explicit Error in Results instead of JsValue
fjarri Sep 16, 2022
7877445
Use a workaround to support Option<&...> in WASM bindings
fjarri Sep 18, 2022
233731d
Generate a correct TypeScript signature for the return value of gener…
fjarri Sep 18, 2022
36f490c
Get rid of Capsule::with_cfrag() workaround
fjarri Sep 16, 2022
62b4f5f
Update JS examples
fjarri Sep 17, 2022
d63b8b7
Extract array processing into a function
fjarri Sep 17, 2022
9d7404a
No cloning in generate_kfrags()
fjarri Sep 17, 2022
2deefc4
Add a trait required by nucypher-core
fjarri Sep 17, 2022
c7a05d4
Remove serde usage from WASM bindgins - don't need it anymore
fjarri Sep 18, 2022
c337736
Simplify cast to Array in WASM bindings
fjarri Sep 18, 2022
afed7f6
Derive Into for some WASM bindings
fjarri Sep 18, 2022
e133001
Some simplification using derived From traits
fjarri Sep 19, 2022
14b21fa
Make all `backend` fields private in Python bindings, use derived Int…
fjarri Sep 19, 2022
ec3a595
Group all custom Typescrip types
fjarri Sep 19, 2022
7196ed6
Update the changelog
fjarri Sep 19, 2022
c4b4591
Return a tuple from encrypt() instead of an EncryptionResult object
fjarri Sep 19, 2022
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
12 changes: 3 additions & 9 deletions umbral-pre-wasm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ let plaintext_bytes = enc.encode(plaintext);
// The API here slightly differs from that in Rust.
// Since wasm-pack does not support returning tuples, we return an object containing
// the ciphertext and the capsule.
let result = umbral.encrypt(alice_pk, plaintext_bytes);
let {capsule, ciphertext} = umbral.encrypt(alice_pk, plaintext_bytes);
let ciphertext = result.ciphertext;
let capsule = result.capsule;

Expand Down Expand Up @@ -75,14 +75,8 @@ let cfrag1 = umbral.reencrypt(capsule, kfrags[1]);

// Finally, Bob opens the capsule by using at least `threshold` cfrags,
// and then decrypts the re-encrypted ciphertext.

// Another deviation from the Rust API.
// wasm-pack does not support taking arrays as arguments,
// so we build a capsule+cfrags object before decryption.
let plaintext_bob = capsule
.withCFrag(cfrag0)
.withCFrag(cfrag1)
.decryptReencrypted(bob_sk, alice_pk, ciphertext);
let plaintext_bob = umbral.decryptReencrypted(
bob_sk, alice_pk, capsule, [cfrag0, cfrag1], ciphertext);

console.assert(dec.decode(plaintext_bob) === plaintext, "decryptReencrypted() failed");
```
Expand Down
10 changes: 3 additions & 7 deletions umbral-pre-wasm/examples/bundler/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ let plaintext_bytes = enc.encode(plaintext);
// The API here slightly differs from that in Rust.
// Since wasm-pack does not support returning tuples, we return an object containing
// the ciphertext and the capsule.
let result = umbral.encrypt(alice_pk, plaintext_bytes);
let ciphertext = result.ciphertext;
let capsule = result.capsule;
let {capsule, ciphertext} = umbral.encrypt(alice_pk, plaintext_bytes);

// Since data was encrypted with Alice's public key, Alice can open the capsule
// and decrypt the ciphertext with her private key.
Expand Down Expand Up @@ -73,10 +71,8 @@ let cfrag1 = umbral.reencrypt(capsule, kfrags[1]);
// Another deviation from the Rust API.
// wasm-pack does not support taking arrays as arguments,
// so we build a capsule+cfrags object before decryption.
let plaintext_bob = capsule
.withCFrag(cfrag0)
.withCFrag(cfrag1)
.decryptReencrypted(bob_sk, alice_pk, ciphertext);
let plaintext_bob = umbral.decryptReencrypted(
bob_sk, alice_pk, capsule, [cfrag0, cfrag1], ciphertext);

console.assert(dec.decode(plaintext_bob) === plaintext, "decryptReencrypted() failed");

Expand Down
10 changes: 3 additions & 7 deletions umbral-pre-wasm/examples/node/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ let plaintext_bytes = enc.encode(plaintext);
// The API here slightly differs from that in Rust.
// Since wasm-pack does not support returning tuples, we return an object containing
// the ciphertext and the capsule.
let result = umbral.encrypt(alice_pk, plaintext_bytes);
let ciphertext = result.ciphertext;
let capsule = result.capsule;
let {capsule, ciphertext} = umbral.encrypt(alice_pk, plaintext_bytes);

// Since data was encrypted with Alice's public key, Alice can open the capsule
// and decrypt the ciphertext with her private key.
Expand Down Expand Up @@ -73,10 +71,8 @@ let cfrag1 = umbral.reencrypt(capsule, kfrags[1]);
// Another deviation from the Rust API.
// wasm-pack does not support taking arrays as arguments,
// so we build a capsule+cfrags object before decryption.
let plaintext_bob = capsule
.withCFrag(cfrag0)
.withCFrag(cfrag1)
.decryptReencrypted(bob_sk, alice_pk, ciphertext);
let plaintext_bob = umbral.decryptReencrypted(
bob_sk, alice_pk, capsule, [cfrag0, cfrag1], ciphertext);

console.assert(dec.decode(plaintext_bob) === plaintext, "decryptReencrypted() failed");

Expand Down
10 changes: 3 additions & 7 deletions umbral-pre-wasm/examples/react/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,7 @@ function App() {
// The API here slightly differs from that in Rust.
// Since wasm-pack does not support returning tuples, we return an object containing
// the ciphertext and the capsule.
let result = umbral.encrypt(alice_pk, plaintext_bytes);
let ciphertext = result.ciphertext;
let capsule = result.capsule;
let {capsule, ciphertext} = umbral.encrypt(alice_pk, plaintext_bytes);

// Since data was encrypted with Alice's public key, Alice can open the capsule
// and decrypt the ciphertext with her private key.
Expand Down Expand Up @@ -106,10 +104,8 @@ function App() {
// Another deviation from the Rust API.
// wasm-pack does not support taking arrays as arguments,
// so we build a capsule+cfrags object before decryption.
let plaintext_bob = capsule
.withCFrag(cfrag0)
.withCFrag(cfrag1)
.decryptReencrypted(bob_sk, alice_pk, ciphertext);
let plaintext_bob = umbral.decryptReencrypted(
bob_sk, alice_pk, capsule, [cfrag0, cfrag1], ciphertext);

console.assert(
dec.decode(plaintext_bob) === plaintext,
Expand Down
8 changes: 3 additions & 5 deletions umbral-pre-wasm/examples/webpack-5-experiments/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ let plaintext_bytes = enc.encode(plaintext);
// The API here slightly differs from that in Rust.
// Since wasm-pack does not support returning tuples, we return an object containing
// the ciphertext and the capsule.
let result = umbral.encrypt(alice_pk, plaintext_bytes);
let {capsule, ciphertext} = umbral.encrypt(alice_pk, plaintext_bytes);
let ciphertext = result.ciphertext;
let capsule = result.capsule;

Expand Down Expand Up @@ -73,10 +73,8 @@ let cfrag1 = umbral.reencrypt(capsule, kfrags[1]);
// Another deviation from the Rust API.
// wasm-pack does not support taking arrays as arguments,
// so we build a capsule+cfrags object before decryption.
let plaintext_bob = capsule
.withCFrag(cfrag0)
.withCFrag(cfrag1)
.decryptReencrypted(bob_sk, alice_pk, ciphertext);
let plaintext_bob = umbral.decryptReencrypted(
bob_sk, alice_pk, capsule, [cfrag0, cfrag1], ciphertext);

console.assert(dec.decode(plaintext_bob) === plaintext, "decryptReencrypted() failed");

Expand Down
8 changes: 5 additions & 3 deletions umbral-pre/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ serde = { version = "1", default-features = false, features = ["derive"], option
base64 = { version = "0.13", default-features = false, features = ["alloc"] }
pyo3 = { version = "0.16", optional = true }
js-sys = { version = "0.3", optional = true }
wasm-bindgen = {version = "0.2.74", optional = true }
wasm-bindgen = { version = "0.2.74", optional = true }
derive_more = { version = "0.99", optional = true, default_features = false, features = ["as_ref", "from", "into"] }
wasm-bindgen-derive = { version = "0.1", optional = true }

# These packages are among the dependencies of the packages above.
# Their versions should be updated when the main packages above are updated.
Expand All @@ -43,8 +45,8 @@ rmp-serde = "0.15"
[features]
default = ["default-rng"]
bench-internals = ["default-rng"]
bindings-python = ["pyo3", "std"]
bindings-wasm = [ "serde-support", "js-sys", "wasm-bindgen"]
bindings-python = ["pyo3", "std", "derive_more"]
bindings-wasm = ["js-sys", "wasm-bindgen", "derive_more", "wasm-bindgen-derive"]
default-rng = ["getrandom", "rand_core/getrandom"]
serde-support = ["serde"]
std = []
Expand Down
Loading