Compare commits

...

13 Commits

Author SHA1 Message Date
Ryan Heywood fc517a8047
remove extra files, continue rename process 2024-11-16 19:49:37 -05:00
Ryan Heywood 64315676f8
update hashbrown to 0.15 2024-11-16 19:39:32 -05:00
Ryan Heywood 4faab1cd33
blahaj::math: increase allowable polynomial coefficients to maximum
The previously existing polynomial coefficients had an inverse bias
towards `0`, only starting higher than `1`. This allows `0` to be a
valid polynomial.

As per an audit performed by Cure53:

> The correct method to select a random polynomial would be to select
all coefficients (including the most significant coefficient) uniformly
in the range 0..255 (inclusive). Otherwise, knowledge that a coefficient
in a polynomial cannot be 0 permits the exclusion of single byte values
for the shared secret given one share less than required. [...]
Exploiting this weakness necessitates sharing the same secret multiple
times. In this scenario, an attacker could exclude an exponential number
of values for each of the shared bytes until sufficiently few values
remain for brute forcing.  Cure53 estimates that under ideal
circumstances (e.g., a 2-out-of-N scheme) a shared secret can be
reconstructed if the same secret has been distributed 500-1500 times.
2024-11-16 19:26:26 -05:00
Ryan Heywood f10fef2c88
blahaj::math: make clippy happy 2024-11-16 19:18:43 -05:00
Ryan Heywood de314fed2c
soft fork, rename to blahaj 2024-11-16 19:11:25 -05:00
Aitor Ruano e7e23ba899 0.4.3 -> 0.5.0 2021-03-14 18:06:00 +01:00
Garrett T 775333fe17
Add Zeroize to Share and GF256 (#19)
* Add Zeroize crate to project behind a default feature flag

Closes https://github.com/c0dearm/sharks/issues/8

* Switch match to Clone to add zeroize(drop)

* Add zeroize(drop) to Share

Co-authored-by: Aitor Ruano <45633475+c0dearm@users.noreply.github.com>
2021-03-14 17:56:20 +01:00
Garrett T 1f86cadf23
Add Apple M1 arm as a benchmark (#18) 2021-03-14 17:35:43 +01:00
Aitor Ruano b1e7a5b1e1 bump to version 0.4.3 2021-02-04 10:15:03 +01:00
Benoît C 5505a0c42c
Update dependencies (#17)
Co-authored-by: Benoît CORTIER <benoit.cortier@fried-world.eu>
2021-02-04 10:11:43 +01:00
Aitor Ruano af4f469da9 bump version 2020-08-03 10:33:50 +02:00
DCsunset 69428361ba
fix: show TryFrom trait import in doc (#16) 2020-08-03 10:30:43 +02:00
zer0x64 5b798ab016
Add fuzzers (#14)
Improved lib stability using fuzzers for testing
2020-04-24 08:10:40 +02:00
18 changed files with 236 additions and 310 deletions

View File

@ -18,7 +18,7 @@ jobs:
command: check command: check
test-std: test-std:
name: Test name: Test std
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -32,7 +32,7 @@ jobs:
command: test command: test
test-nostd: test-nostd:
name: Test name: Test no-std
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

View File

@ -4,6 +4,35 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [0.6.0] - 2024-11-16
### Changed
- Rename project to `blahaj` following soft-fork
- Use `u8::MAX` instead of deprecated `u8::max_value()`
- Upgraded project dependencies
### Fixed
- Lower bound of polynomial coefficients changed from 1 to 0
## [0.5.0] - 2021-03-14
### Added
- Zeroize memory on drop for generated secret shares
## [0.4.3] - 2021-02-04
### Changed
- Upgraded project dependencies
## [0.4.2] - 2020-08-03
### Fixed
- Small fix in docs
## [0.4.1] - 2020-04-23
### Added
- Fuzz tests
### Fixed
- Unexpected panic when trying to recover secret from different length shares
- Unexpected panic when trying to convert less than 2 bytes to `Share`
## [0.4.0] - 2020-04-02 ## [0.4.0] - 2020-04-02
### Added ### Added
- It is now possible to compile without `std` with `--no-default-features` - It is now possible to compile without `std` with `--no-default-features`

View File

@ -1,12 +1,11 @@
Copyrights in the Sharks project are retained by their contributors. No Copyrights in the Blahaj project are retained by their contributors. No
copyright assignment is required to contribute to the Sharks project. copyright assignment is required to contribute to the Blahaj project.
For full authorship information, see the version control history. For full authorship information, see the version control history.
Except as otherwise noted (below and/or in individual files), Sharks is Except as otherwise noted (below and/or in individual files), Sharks is
licensed under the Apache License, Version 2.0 <LICENSE-APACHE> or licensed under the MIT license <LICENSE-MIT> or
<http://www.apache.org/licenses/LICENSE-2.0> or the MIT license <http://opensource.org/licenses/MIT>.
<LICENSE-MIT> or <http://opensource.org/licenses/MIT>, at your option.
The Sharks project includes code from the Rust project The Blahaj project includes code from the Rust project published under these
published under these same licenses. same licenses.

View File

@ -1,32 +1,31 @@
[package] [package]
name = "sharks" name = "blahaj"
version = "0.4.0" version = "0.6.0"
authors = ["Aitor Ruano <codearm@pm.me>"] authors = ["Ryan Heywood <ryan@distrust.co>"]
description = "Fast, small and secure Shamir's Secret Sharing library crate" description = "Fast, small, and secure Shamir's Secret Sharing"
homepage = "https://github.com/c0dearm/sharks" homepage = "https://git.distrust.co/public/blahaj"
repository = "https://github.com/c0dearm/sharks" repository = "https://git.distrust.co/public/blahaj"
readme = "README.md" readme = "README.md"
keywords = ["shamir", "secret", "sharing", "share", "crypto"] keywords = ["shamir", "secret", "sharing", "share", "cryptography"]
categories = ["algorithms", "cryptography", "mathematics"] categories = ["algorithms", "cryptography", "mathematics"]
license = "MIT/Apache-2.0" license = "MIT"
edition = "2018" edition = "2021"
[badges]
maintenance = { status = "actively-developed" }
codecov = { repository = "c0dearm/sharks" }
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[features] [features]
default = ["std"] default = ["std", "zeroize_memory"]
std = ["rand/std"] std = ["rand/std", "rand/std_rng"]
fuzzing = ["std", "arbitrary"]
zeroize_memory = ["zeroize"]
[dependencies] [dependencies]
rand = { version = "0.7", default-features = false } rand = { version = "0.8", default-features = false }
hashbrown = "0.7" hashbrown = "0.15"
arbitrary = { version = "0.4.7", features = ["derive"], optional = true }
zeroize = { version = "1.2.0", features = ["zeroize_derive"], optional = true }
[dev-dependencies] [dev-dependencies]
criterion = "0.3" criterion = "0.3"
rand_chacha = "0.2" rand_chacha = "0.3"
[[bench]] [[bench]]
name = "benchmarks" name = "benchmarks"

View File

@ -1,201 +0,0 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright 2020 Aitor Ruano Miralles
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

View File

@ -1,15 +1,12 @@
# Sharks # Blahaj
[![Rust](https://github.com/c0dearm/sharks/workflows/Rust/badge.svg?branch=master)](https://github.com/c0dearm/sharks/actions) [![Crates](https://img.shields.io/crates/v/blahaj.svg)](https://crates.io/crates/blahaj)
[![Crates](https://img.shields.io/crates/v/sharks.svg)](https://crates.io/crates/sharks) [![Docs](https://docs.rs/blahaj/badge.svg)](https://docs.rs/blahaj)
[![Docs](https://docs.rs/sharks/badge.svg)](https://docs.rs/sharks)
[![Codecov](https://codecov.io/gh/c0dearm/sharks/branch/master/graph/badge.svg)](https://codecov.io/gh/c0dearm/sharks)
[![License](https://camo.githubusercontent.com/47069b7e06b64b608c692a8a7f40bc6915cf629c/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d417061636865322e302532464d49542d626c75652e737667)](https://github.com/c0dearm/sharks/blob/master/COPYRIGHT)
Fast, small and secure [Shamir's Secret Sharing](https://en.wikipedia.org/wiki/Shamir%27s_Secret_Sharing) library crate Fast, small and secure [Shamir's Secret Sharing](https://en.wikipedia.org/wiki/Shamir%27s_Secret_Sharing) library crate
Documentation: Documentation:
- [API reference (docs.rs)](https://docs.rs/sharks) - [API reference (docs.rs)](https://docs.rs/blahaj)
## Usage ## Usage
@ -17,17 +14,17 @@ Add this to your `Cargo.toml`:
```toml ```toml
[dependencies] [dependencies]
sharks = "0.4" blahaj = "0.6"
``` ```
If your environment doesn't support `std`: If your environment doesn't support `std`:
```toml ```toml
[dependencies] [dependencies]
sharks = { version = "0.4", default-features = false } blahaj = { version = "0.6", default-features = false }
``` ```
To get started using Sharks, see the [Rust docs](https://docs.rs/sharks) To get started using Blahaj, see the [Rust docs](https://docs.rs/blahaj)
## Features ## Features
@ -58,19 +55,15 @@ You can run them with `cargo test` and `cargo bench`.
| ----------------------------------------- | ------------------------------- | ------------------------------- | ------------------------------- | ------------------------------- | ------------------------------- | | ----------------------------------------- | ------------------------------- | ------------------------------- | ------------------------------- | ------------------------------- | ------------------------------- |
| Intel(R) Core(TM) i7-8550U CPU @ 1.80GHz | [1.4321 us 1.4339 us 1.4357 us] | [1.3385 ns 1.3456 ns 1.3552 ns] | [228.77 us 232.17 us 236.23 us] | [24.688 ns 25.083 ns 25.551 ns] | [22.832 ns 22.910 ns 22.995 ns] | | Intel(R) Core(TM) i7-8550U CPU @ 1.80GHz | [1.4321 us 1.4339 us 1.4357 us] | [1.3385 ns 1.3456 ns 1.3552 ns] | [228.77 us 232.17 us 236.23 us] | [24.688 ns 25.083 ns 25.551 ns] | [22.832 ns 22.910 ns 22.995 ns] |
| Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz | [1.3439 us 1.3499 us 1.3562 us] | [1.5416 ns 1.5446 ns 1.5481 ns] | [197.46 us 198.37 us 199.22 us] | [20.455 ns 20.486 ns 20.518 ns] | [18.726 ns 18.850 ns 18.993 ns] | | Intel(R) Core(TM) i7-8565U CPU @ 1.80GHz | [1.3439 us 1.3499 us 1.3562 us] | [1.5416 ns 1.5446 ns 1.5481 ns] | [197.46 us 198.37 us 199.22 us] | [20.455 ns 20.486 ns 20.518 ns] | [18.726 ns 18.850 ns 18.993 ns] |
| Apple M1 ARM (Macbook Air) | [3.3367 us 3.3629 us 3.4058 us] | [741.75 ps 742.65 ps 743.52 ps] | [210.14 us 210.23 us 210.34 us] | [27.567 ns 27.602 ns 27.650 ns] | [26.716 ns 26.735 ns 26.755 ns] |
# Contributing # Contributing
If you find a vulnerability, bug or would like a new feature, [open a new issue](https://github.com/c0dearm/sharks/issues/new). If you find a vulnerability, bug or would like a new feature, reach out to
<mailto:team@distrust.co>.
To introduce your changes into the codebase, submit a Pull Request.
Many thanks!
# License # License
Sharks is distributed under the terms of both the MIT license and the Blahaj is distributed under the terms of the MIT license.
Apache License (Version 2.0).
See [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT), and See [LICENSE-MIT](LICENSE-MIT) and [COPYRIGHT](COPYRIGHT) for details.
[COPYRIGHT](COPYRIGHT) for details.

View File

@ -1,6 +1,7 @@
use criterion::{black_box, criterion_group, criterion_main, Criterion}; use criterion::{black_box, criterion_group, criterion_main, Criterion};
use std::convert::TryFrom;
use sharks::{Share, Sharks}; use blahaj::{Share, Sharks};
fn dealer(c: &mut Criterion) { fn dealer(c: &mut Criterion) {
let sharks = Sharks(255); let sharks = Sharks(255);
@ -24,10 +25,10 @@ fn recover(c: &mut Criterion) {
fn share(c: &mut Criterion) { fn share(c: &mut Criterion) {
let bytes_vec = vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; let bytes_vec = vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
let bytes = bytes_vec.as_slice(); let bytes = bytes_vec.as_slice();
let share = Share::from(bytes); let share = Share::try_from(bytes).unwrap();
c.bench_function("share_from_bytes", |b| { c.bench_function("share_from_bytes", |b| {
b.iter(|| Share::from(black_box(bytes))) b.iter(|| Share::try_from(black_box(bytes)))
}); });
c.bench_function("share_to_bytes", |b| { c.bench_function("share_to_bytes", |b| {

View File

@ -1,20 +0,0 @@
codecov:
require_ci_to_pass: yes
coverage:
precision: 2
round: down
range: "90...100"
parsers:
gcov:
branch_detection:
conditional: yes
loop: yes
method: no
macro: no
comment:
layout: "reach,diff,flags,tree"
behavior: default
require_changes: no

4
fuzz/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
target
corpus
artifacts

38
fuzz/Cargo.toml Normal file
View File

@ -0,0 +1,38 @@
[package]
name = "sharks-fuzz"
version = "0.0.0"
authors = ["Automatically generated"]
publish = false
edition = "2018"
[package.metadata]
cargo-fuzz = true
[dependencies]
libfuzzer-sys = "0.3"
arbitrary = { version = "0.4.2", features = ["derive"] }
[dependencies.sharks]
path = ".."
features = ["fuzzing"]
# Prevent this from interfering with workspaces
[workspace]
members = ["."]
[[bin]]
name = "deserialize_share"
path = "fuzz_targets/deserialize_share.rs"
[[bin]]
name = "serialize_share"
path = "fuzz_targets/serialize_share.rs"
[[bin]]
name = "generate_shares"
path = "fuzz_targets/generate_shares.rs"
[[bin]]
name = "recover"
path = "fuzz_targets/recover.rs"

View File

@ -0,0 +1,8 @@
#![no_main]
use core::convert::TryFrom;
use libfuzzer_sys::fuzz_target;
use sharks::Share;
fuzz_target!(|data: &[u8]| {
let _share = Share::try_from(data);
});

View File

@ -0,0 +1,19 @@
#![no_main]
use libfuzzer_sys::fuzz_target;
use arbitrary::Arbitrary;
use sharks::{Share, Sharks};
#[derive(Debug, Arbitrary)]
struct Parameters {
pub threshold: u8,
pub secret: Vec<u8>,
pub n_shares: usize,
}
fuzz_target!(|params: Parameters| {
let sharks = Sharks(params.threshold);
let dealer = sharks.dealer(&params.secret);
let _shares: Vec<Share> = dealer.take(params.n_shares).collect();
});

View File

@ -0,0 +1,16 @@
#![no_main]
use libfuzzer_sys::fuzz_target;
use arbitrary::Arbitrary;
use sharks::{Share, Sharks};
#[derive(Debug, Arbitrary)]
struct Parameters {
pub threshold: u8,
pub shares: Vec<Share>,
}
fuzz_target!(|params: Parameters| {
let sharks = Sharks(params.threshold);
let _secret = sharks.recover(&params.shares);
});

View File

@ -0,0 +1,8 @@
#![no_main]
use libfuzzer_sys::fuzz_target;
use sharks::Share;
fuzz_target!(|share: Share| {
let _data: Vec<u8> = (&share).into();
});

View File

@ -4,6 +4,12 @@
use core::iter::{Product, Sum}; use core::iter::{Product, Sum};
use core::ops::{Add, Div, Mul, Sub}; use core::ops::{Add, Div, Mul, Sub};
#[cfg(feature = "fuzzing")]
use arbitrary::Arbitrary;
#[cfg(feature = "zeroize_memory")]
use zeroize::Zeroize;
const LOG_TABLE: [u8; 256] = [ const LOG_TABLE: [u8; 256] = [
0x00, 0x00, 0x01, 0x19, 0x02, 0x32, 0x1a, 0xc6, 0x03, 0xdf, 0x33, 0xee, 0x1b, 0x68, 0xc7, 0x4b, 0x00, 0x00, 0x01, 0x19, 0x02, 0x32, 0x1a, 0xc6, 0x03, 0xdf, 0x33, 0xee, 0x1b, 0x68, 0xc7, 0x4b,
0x04, 0x64, 0xe0, 0x0e, 0x34, 0x8d, 0xef, 0x81, 0x1c, 0xc1, 0x69, 0xf8, 0xc8, 0x08, 0x4c, 0x71, 0x04, 0x64, 0xe0, 0x0e, 0x34, 0x8d, 0xef, 0x81, 0x1c, 0xc1, 0x69, 0xf8, 0xc8, 0x08, 0x4c, 0x71,
@ -58,7 +64,10 @@ const EXP_TABLE: [u8; 512] = [
0x58, 0xb0, 0x7d, 0xfa, 0xe9, 0xcf, 0x83, 0x1b, 0x36, 0x6c, 0xd8, 0xad, 0x47, 0x8e, 0x01, 0x02, 0x58, 0xb0, 0x7d, 0xfa, 0xe9, 0xcf, 0x83, 0x1b, 0x36, 0x6c, 0xd8, 0xad, 0x47, 0x8e, 0x01, 0x02,
]; ];
#[derive(Debug, PartialEq, Copy, Clone)] #[derive(Debug, PartialEq, Clone)]
#[cfg_attr(feature = "fuzzing", derive(Arbitrary))]
#[cfg_attr(feature = "zeroize_memory", derive(Zeroize))]
#[cfg_attr(feature = "zeroize_memory", zeroize(drop))]
pub struct GF256(pub u8); pub struct GF256(pub u8);
#[allow(clippy::suspicious_arithmetic_impl)] #[allow(clippy::suspicious_arithmetic_impl)]

View File

@ -2,7 +2,7 @@
//! //!
//! Usage example (std): //! Usage example (std):
//! ``` //! ```
//! use sharks::{ Sharks, Share }; //! use blahaj::{ Sharks, Share };
//! //!
//! // Set a minimum threshold of 10 shares //! // Set a minimum threshold of 10 shares
//! let sharks = Sharks(10); //! let sharks = Sharks(10);
@ -20,7 +20,7 @@
//! //!
//! Usage example (no std): //! Usage example (no std):
//! ``` //! ```
//! use sharks::{ Sharks, Share }; //! use blahaj::{ Sharks, Share };
//! use rand_chacha::rand_core::SeedableRng; //! use rand_chacha::rand_core::SeedableRng;
//! //!
//! // Set a minimum threshold of 10 shares //! // Set a minimum threshold of 10 shares
@ -34,7 +34,7 @@
//! let secret = sharks.recover(shares.as_slice()).unwrap(); //! let secret = sharks.recover(shares.as_slice()).unwrap();
//! assert_eq!(secret, vec![1, 2, 3, 4]); //! assert_eq!(secret, vec![1, 2, 3, 4]);
//! ``` //! ```
#![no_std] #![cfg_attr(not(feature = "std"), no_std)]
mod field; mod field;
mod math; mod math;
@ -53,7 +53,7 @@ pub use share::Share;
/// ///
/// Usage example: /// Usage example:
/// ``` /// ```
/// # use sharks::{ Sharks, Share }; /// # use blahaj::{ Sharks, Share };
/// // Set a minimum threshold of 10 shares /// // Set a minimum threshold of 10 shares
/// let sharks = Sharks(10); /// let sharks = Sharks(10);
/// // Obtain an iterator over the shares for secret [1, 2, 3, 4] /// // Obtain an iterator over the shares for secret [1, 2, 3, 4]
@ -79,7 +79,7 @@ impl Sharks {
/// ///
/// Example: /// Example:
/// ``` /// ```
/// # use sharks::{ Sharks, Share }; /// # use blahaj::{ Sharks, Share };
/// # use rand_chacha::rand_core::SeedableRng; /// # use rand_chacha::rand_core::SeedableRng;
/// # let sharks = Sharks(3); /// # let sharks = Sharks(3);
/// // Obtain an iterator over the shares for secret [1, 2] /// // Obtain an iterator over the shares for secret [1, 2]
@ -106,7 +106,7 @@ impl Sharks {
/// ///
/// Example: /// Example:
/// ``` /// ```
/// # use sharks::{ Sharks, Share }; /// # use blahaj::{ Sharks, Share };
/// # let sharks = Sharks(3); /// # let sharks = Sharks(3);
/// // Obtain an iterator over the shares for secret [1, 2] /// // Obtain an iterator over the shares for secret [1, 2]
/// let dealer = sharks.dealer(&[1, 2]); /// let dealer = sharks.dealer(&[1, 2]);
@ -124,7 +124,7 @@ impl Sharks {
/// ///
/// Example: /// Example:
/// ``` /// ```
/// # use sharks::{ Sharks, Share }; /// # use blahaj::{ Sharks, Share };
/// # use rand_chacha::rand_core::SeedableRng; /// # use rand_chacha::rand_core::SeedableRng;
/// # let sharks = Sharks(3); /// # let sharks = Sharks(3);
/// # let mut rng = rand_chacha::ChaCha8Rng::from_seed([0x90; 32]); /// # let mut rng = rand_chacha::ChaCha8Rng::from_seed([0x90; 32]);
@ -143,23 +143,27 @@ impl Sharks {
T: IntoIterator<Item = &'a Share>, T: IntoIterator<Item = &'a Share>,
T::IntoIter: Iterator<Item = &'a Share>, T::IntoIter: Iterator<Item = &'a Share>,
{ {
let (keys, shares) = shares let mut share_length: Option<usize> = None;
.into_iter() let mut keys: HashSet<u8> = HashSet::new();
.map(|s| { let mut values: Vec<Share> = Vec::new();
(
s.x.0,
Share {
x: s.x,
y: s.y.clone(),
},
)
})
.unzip::<u8, Share, HashSet<u8>, Vec<Share>>();
if keys.len() < self.0 as usize { for share in shares.into_iter() {
if share_length.is_none() {
share_length = Some(share.y.len());
}
if Some(share.y.len()) != share_length {
return Err("All shares must have the same length");
} else {
keys.insert(share.x.0);
values.push(share.clone());
}
}
if keys.is_empty() || (keys.len() < self.0 as usize) {
Err("Not enough shares to recover original secret") Err("Not enough shares to recover original secret")
} else { } else {
Ok(math::interpolate(shares.as_slice())) Ok(math::interpolate(values.as_slice()))
} }
} }
} }
@ -197,7 +201,7 @@ mod tests {
let sharks = Sharks(255); let sharks = Sharks(255);
let mut shares: Vec<Share> = sharks.make_shares(&[1]).take(255).collect(); let mut shares: Vec<Share> = sharks.make_shares(&[1]).take(255).collect();
shares[1] = Share { shares[1] = Share {
x: shares[0].x, x: shares[0].x.clone(),
y: shares[0].y.clone(), y: shares[0].y.clone(),
}; };
let secret = sharks.recover(&shares); let secret = sharks.recover(&shares);

View File

@ -20,9 +20,9 @@ pub fn interpolate(shares: &[Share]) -> Vec<u8> {
shares shares
.iter() .iter()
.filter(|s_j| s_j.x != s_i.x) .filter(|s_j| s_j.x != s_i.x)
.map(|s_j| s_j.x / (s_j.x - s_i.x)) .map(|s_j| s_j.x.clone() / (s_j.x.clone() - s_i.x.clone()))
.product::<GF256>() .product::<GF256>()
* s_i.y[s] * s_i.y[s].clone()
}) })
.sum::<GF256>() .sum::<GF256>()
.0 .0
@ -30,12 +30,12 @@ pub fn interpolate(shares: &[Share]) -> Vec<u8> {
.collect() .collect()
} }
// Generates `k` polynomial coefficients, being the last one `s` and the others randomly generated between `[1, 255]`. // Generates `k` polynomial coefficients, being the last one `s` and the others randomly generated between `[0, 255]`.
// Coefficient degrees go from higher to lower in the returned vector order. // Coefficient degrees go from higher to lower in the returned vector order.
pub fn random_polynomial<R: rand::Rng>(s: GF256, k: u8, rng: &mut R) -> Vec<GF256> { pub fn random_polynomial<R: rand::Rng>(s: GF256, k: u8, rng: &mut R) -> Vec<GF256> {
let k = k as usize; let k = k as usize;
let mut poly = Vec::with_capacity(k); let mut poly = Vec::with_capacity(k);
let between = Uniform::new_inclusive(1, 255); let between = Uniform::new_inclusive(0, 255);
for _ in 1..k { for _ in 1..k {
poly.push(GF256(between.sample(rng))); poly.push(GF256(between.sample(rng)));
@ -50,11 +50,14 @@ pub fn random_polynomial<R: rand::Rng>(s: GF256, k: u8, rng: &mut R) -> Vec<GF25
// Each polynomial corresponds to one byte chunk of the original secret. // Each polynomial corresponds to one byte chunk of the original secret.
// The iterator will start at `x = 1` and end at `x = 255`. // The iterator will start at `x = 1` and end at `x = 255`.
pub fn get_evaluator(polys: Vec<Vec<GF256>>) -> impl Iterator<Item = Share> { pub fn get_evaluator(polys: Vec<Vec<GF256>>) -> impl Iterator<Item = Share> {
(1..=u8::max_value()).map(GF256).map(move |x| Share { (1..=u8::MAX).map(GF256).map(move |x| Share {
x, x: x.clone(),
y: polys y: polys
.iter() .iter()
.map(|p| p.iter().fold(GF256(0), |acc, c| acc * x + *c)) .map(|p| {
p.iter()
.fold(GF256(0), |acc, c| acc * x.clone() + c.clone())
})
.collect(), .collect(),
}) })
} }
@ -76,7 +79,7 @@ mod tests {
#[test] #[test]
fn evaluator_works() { fn evaluator_works() {
let iter = get_evaluator(vec![vec![GF256(3), GF256(2), GF256(5)]]); let iter = get_evaluator(vec![vec![GF256(3), GF256(2), GF256(5)]]);
let values: Vec<_> = iter.take(2).map(|s| (s.x, s.y)).collect(); let values: Vec<_> = iter.take(2).map(|s| (s.x.clone(), s.y.clone())).collect();
assert_eq!( assert_eq!(
values, values,
vec![(GF256(1), vec![GF256(4)]), (GF256(2), vec![GF256(13)])] vec![(GF256(1), vec![GF256(4)]), (GF256(2), vec![GF256(13)])]

View File

@ -2,11 +2,18 @@ use alloc::vec::Vec;
use super::field::GF256; use super::field::GF256;
#[cfg(feature = "fuzzing")]
use arbitrary::Arbitrary;
#[cfg(feature = "zeroize_memory")]
use zeroize::Zeroize;
/// A share used to reconstruct the secret. Can be serialized to and from a byte array. /// A share used to reconstruct the secret. Can be serialized to and from a byte array.
/// ///
/// Usage example: /// Usage example:
/// ``` /// ```
/// use sharks::{Sharks, Share}; /// use blahaj::{Sharks, Share};
/// use core::convert::TryFrom;
/// # use rand_chacha::rand_core::SeedableRng; /// # use rand_chacha::rand_core::SeedableRng;
/// # fn send_to_printer(_: Vec<u8>) {} /// # fn send_to_printer(_: Vec<u8>) {}
/// # fn ask_shares() -> Vec<Vec<u8>> {vec![vec![1, 2], vec![2, 3], vec![3, 4]]} /// # fn ask_shares() -> Vec<Vec<u8>> {vec![vec![1, 2], vec![2, 3], vec![3, 4]]}
@ -23,9 +30,12 @@ use super::field::GF256;
/// ///
/// // Get share bytes from an external source and recover secret /// // Get share bytes from an external source and recover secret
/// let shares_bytes: Vec<Vec<u8>> = ask_shares(); /// let shares_bytes: Vec<Vec<u8>> = ask_shares();
/// let shares: Vec<Share> = shares_bytes.iter().map(|s| Share::from(s.as_slice())).collect(); /// let shares: Vec<Share> = shares_bytes.iter().map(|s| Share::try_from(s.as_slice()).unwrap()).collect();
/// let secret = sharks.recover(&shares).unwrap(); /// let secret = sharks.recover(&shares).unwrap();
#[derive(Clone)] #[derive(Clone)]
#[cfg_attr(feature = "fuzzing", derive(Arbitrary, Debug))]
#[cfg_attr(feature = "zeroize_memory", derive(Zeroize))]
#[cfg_attr(feature = "zeroize_memory", zeroize(drop))]
pub struct Share { pub struct Share {
pub x: GF256, pub x: GF256,
pub y: Vec<GF256>, pub y: Vec<GF256>,
@ -42,11 +52,17 @@ impl From<&Share> for Vec<u8> {
} }
/// Obtains a `Share` instance from a byte slice /// Obtains a `Share` instance from a byte slice
impl From<&[u8]> for Share { impl core::convert::TryFrom<&[u8]> for Share {
fn from(s: &[u8]) -> Share { type Error = &'static str;
let x = GF256(s[0]);
let y = s[1..].iter().map(|p| GF256(*p)).collect(); fn try_from(s: &[u8]) -> Result<Share, Self::Error> {
Share { x, y } if s.len() < 2 {
Err("A Share must be at least 2 bytes long")
} else {
let x = GF256(s[0]);
let y = s[1..].iter().map(|p| GF256(*p)).collect();
Ok(Share { x, y })
}
} }
} }
@ -54,6 +70,7 @@ impl From<&[u8]> for Share {
mod tests { mod tests {
use super::{Share, GF256}; use super::{Share, GF256};
use alloc::{vec, vec::Vec}; use alloc::{vec, vec::Vec};
use core::convert::TryFrom;
#[test] #[test]
fn vec_from_share_works() { fn vec_from_share_works() {
@ -68,7 +85,7 @@ mod tests {
#[test] #[test]
fn share_from_u8_slice_works() { fn share_from_u8_slice_works() {
let bytes = [1, 2, 3]; let bytes = [1, 2, 3];
let share = Share::from(&bytes[..]); let share = Share::try_from(&bytes[..]).unwrap();
assert_eq!(share.x, GF256(1)); assert_eq!(share.x, GF256(1));
assert_eq!(share.y, vec![GF256(2), GF256(3)]); assert_eq!(share.y, vec![GF256(2), GF256(3)]);
} }