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.

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

tuftool v0.12.0: Pull upstream updates #82

Merged
merged 43 commits into from
Mar 5, 2025
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
a1cc6cb
Merge pull request #781 from jpculp/dep-bump
jpculp Jul 17, 2024
a313b9f
Bump rust to 1.78.0 in actions runner
jpculp Jul 17, 2024
8fb4469
Merge pull request #780 from jpculp/rust-bump
jpculp Jul 19, 2024
864be9c
Bump cargo-deny in Makefile
jpculp Aug 2, 2024
18791c1
Bump rust to stable in actions runner
jpculp Aug 2, 2024
b3f16c9
Update rust dependencies
jpculp Aug 2, 2024
f2a8cce
fix: timestamp.json meta can has optional fields
flavio Jul 1, 2024
29289de
Merge pull request #778 from flavio/timestamp.json-optional-fields-in…
jpculp Aug 12, 2024
446a460
Merge pull request #802 from jpculp/rust-1.80.0
jpculp Aug 15, 2024
7cf66e9
Prepare for release
mgsharm Sep 4, 2024
ecab7eb
Merge pull request #817 from mgsharm/develop
mgsharm Sep 4, 2024
3b46fea
Fix 128bit integer serialization
aumetra Sep 8, 2024
a2f4e72
dependency: update aws-sdk-kms to v1.41
sumukhballal Sep 10, 2024
a329db4
tuftool: switch to use rustls-tls-native-roots for reqwest
sumukhballal Sep 10, 2024
935a17b
Merge pull request #822 from sumukhballal/update-aws-dependencies
sumukhballal Sep 10, 2024
81c2efe
Prepare for release
mgsharm Sep 10, 2024
1304bb7
Merge pull request #823 from mgsharm/tuftool-release
mgsharm Sep 10, 2024
32dc4c0
tough: migrate from ring to aws-lc-rs
ginglis13 Sep 13, 2024
fe4e849
tuftool: migrate to aws-lc-rs
ginglis13 Sep 13, 2024
126f485
tough-kms: migrate from ring to aws-lc-rs
ginglis13 Sep 13, 2024
f8f9b7e
licenses: skip untrusted v0.7.1
ginglis13 Sep 13, 2024
bbc3509
Merge pull request #825 from ginglis13/migrate-ring-aws-lc-rs
ginglis13 Sep 26, 2024
112ea9f
tough-kms: upgrade to hyper-v1 using aws-smithy-experimental
gthao313 Sep 18, 2024
017d903
tough-ssm: upgrade to hyper-v1 using aws-smithy-experimental
gthao313 Sep 18, 2024
3f11fd8
tuftool: update aws-config to use hyper v1
gthao313 Sep 18, 2024
aecc1a1
Merge pull request #826 from gthao313/hyper_v1
gthao313 Sep 27, 2024
af6a909
feature: add a 'fips' feature to crates
ginglis13 Sep 26, 2024
f501c0f
tuftool: install default CryptoProvider for HTTP client
ginglis13 Sep 26, 2024
680cc11
deps: bump reqwest to 0.12, httptest to 0.16
ginglis13 Sep 30, 2024
5619bb1
Merge pull request #828 from ginglis13/fips
ginglis13 Oct 1, 2024
4333b75
Merge pull request #820 from aumetra/aw/fix-i128-u128
bcressey Oct 9, 2024
c5f5653
Prepare for release
mgsharm Oct 10, 2024
e8f453e
Merge pull request #835 from mgsharm/develop
mgsharm Oct 10, 2024
dbde931
Update cargo dependencies
mgsharm Dec 20, 2024
90325a8
clippy fixes
mgsharm Dec 20, 2024
b47a391
Merge pull request #840 from mgsharm/dependency-update
mgsharm Dec 23, 2024
02e6daf
build(deps): bump seanmiddleditch/gha-setup-ninja from 4 to 5
dependabot[bot] Dec 31, 2024
4849410
Merge pull request #831 from awslabs/dependabot/github_actions/seanmi…
jpculp Dec 31, 2024
5f695a1
Resolved merge conflicts
fghanmi Mar 5, 2025
e8c9c9c
fix failures
fghanmi Mar 5, 2025
7b0012a
fix failures
fghanmi Mar 5, 2025
f5b9c20
fix failures
fghanmi Mar 5, 2025
b4aff8c
fix failures
fghanmi Mar 5, 2025
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
Prev Previous commit
Next Next commit
Fix 128bit integer serialization
aumetra committed Sep 8, 2024
commit 3b46feaeaf8048d46f85d023295e65563b84d7d6
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions olpc-cjson/Cargo.toml
Original file line number Diff line number Diff line change
@@ -12,3 +12,6 @@ edition = "2018"
serde = "1"
serde_json = "1"
unicode-normalization = "0.1"

[dev-dependencies]
serde_derive = "1"
30 changes: 30 additions & 0 deletions olpc-cjson/src/lib.rs
Original file line number Diff line number Diff line change
@@ -146,10 +146,12 @@ impl Formatter for CanonicalFormatter {
wrapper!(write_i16, i16);
wrapper!(write_i32, i32);
wrapper!(write_i64, i64);
wrapper!(write_i128, i128);
wrapper!(write_u8, u8);
wrapper!(write_u16, u16);
wrapper!(write_u32, u32);
wrapper!(write_u64, u64);
wrapper!(write_u128, u128);

fn write_f32<W: Write + ?Sized>(&mut self, _writer: &mut W, _value: f32) -> Result<()> {
float_err!()
@@ -468,4 +470,32 @@ mod tests {
];
assert_eq!(expected, encoded);
}

#[test]
fn encode_u128_i128() {
#[derive(serde_derive::Serialize)]
struct Object {
u128: u128,
i128: i128,
}

let value = Object {
u128: u128::MAX,
i128: i128::MIN,
};

let mut buf = Vec::new();
let mut ser = Serializer::with_formatter(&mut buf, CanonicalFormatter::new());
value.serialize(&mut ser).unwrap();

let expected = [
123, 34, 105, 49, 50, 56, 34, 58, 45, 49, 55, 48, 49, 52, 49, 49, 56, 51, 52, 54, 48,
52, 54, 57, 50, 51, 49, 55, 51, 49, 54, 56, 55, 51, 48, 51, 55, 49, 53, 56, 56, 52, 49,
48, 53, 55, 50, 56, 44, 34, 117, 49, 50, 56, 34, 58, 51, 52, 48, 50, 56, 50, 51, 54,
54, 57, 50, 48, 57, 51, 56, 52, 54, 51, 52, 54, 51, 51, 55, 52, 54, 48, 55, 52, 51, 49,
55, 54, 56, 50, 49, 49, 52, 53, 53, 125,
];

assert_eq!(buf, expected);
}
}