From 80d389d88754b6accef031ef226c7deb5e4e3c5e Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Mon, 16 Oct 2023 16:37:55 +0200 Subject: [PATCH] update rust edition --- CHANGELOG.md | 1 + Cargo.toml | 3 ++- pqcrypto-classicmceliece/Cargo.toml | 2 +- pqcrypto-dilithium/Cargo.toml | 2 +- pqcrypto-falcon/Cargo.toml | 2 +- pqcrypto-hqc/Cargo.toml | 2 +- pqcrypto-kyber/Cargo.toml | 2 +- pqcrypto-sphincsplus/Cargo.toml | 2 +- pqcrypto-template/scheme/Cargo.toml.j2 | 2 +- pqcrypto-template/workspace-Cargo.toml.j2 | 1 + 10 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0be84a0b..e39c273c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ * Bring SPHINCS+ to closer to FIPS variants by removing -robust and Haraka variants * Small fix in Falcon * Add Falcon NEON implementation +* Update Rust edition to 2021 ## 2023-04-26 diff --git a/Cargo.toml b/Cargo.toml index b1af8d83..2e0565c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,4 +10,5 @@ members=[ "pqcrypto-dilithium", "pqcrypto-falcon", "pqcrypto-sphincsplus", -] \ No newline at end of file +] +resolver="2" \ No newline at end of file diff --git a/pqcrypto-classicmceliece/Cargo.toml b/pqcrypto-classicmceliece/Cargo.toml index 912afee8..3b8eee8c 100644 --- a/pqcrypto-classicmceliece/Cargo.toml +++ b/pqcrypto-classicmceliece/Cargo.toml @@ -4,7 +4,7 @@ description = "Post-Quantum Key-Encapsulation Mechanism classicmceliece" readme = "README.md" version = "0.2.0" authors = ["Thom Wiggers "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" homepage = "https://github.com/rustpq/" repository = "https://github.com/rustpq/pqcrypto/" diff --git a/pqcrypto-dilithium/Cargo.toml b/pqcrypto-dilithium/Cargo.toml index a96cb2d8..835d2e40 100644 --- a/pqcrypto-dilithium/Cargo.toml +++ b/pqcrypto-dilithium/Cargo.toml @@ -4,7 +4,7 @@ description = "Post-Quantum Signature Scheme dilithium" readme = "README.md" version = "0.5.0" authors = ["Thom Wiggers "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" homepage = "https://github.com/rustpq/" repository = "https://github.com/rustpq/pqcrypto/" diff --git a/pqcrypto-falcon/Cargo.toml b/pqcrypto-falcon/Cargo.toml index 57858b26..269d16d5 100644 --- a/pqcrypto-falcon/Cargo.toml +++ b/pqcrypto-falcon/Cargo.toml @@ -4,7 +4,7 @@ description = "Post-Quantum Signature Scheme falcon" readme = "README.md" version = "0.3.0" authors = ["Thom Wiggers "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" homepage = "https://github.com/rustpq/" repository = "https://github.com/rustpq/pqcrypto/" diff --git a/pqcrypto-hqc/Cargo.toml b/pqcrypto-hqc/Cargo.toml index faa52691..1b89217b 100644 --- a/pqcrypto-hqc/Cargo.toml +++ b/pqcrypto-hqc/Cargo.toml @@ -4,7 +4,7 @@ description = "Post-Quantum Key-Encapsulation Mechanism hqc" readme = "README.md" version = "0.2.0" authors = ["Thom Wiggers "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" homepage = "https://github.com/rustpq/" repository = "https://github.com/rustpq/pqcrypto/" diff --git a/pqcrypto-kyber/Cargo.toml b/pqcrypto-kyber/Cargo.toml index c850a8eb..41fc6f5d 100644 --- a/pqcrypto-kyber/Cargo.toml +++ b/pqcrypto-kyber/Cargo.toml @@ -4,7 +4,7 @@ description = "Post-Quantum Key-Encapsulation Mechanism kyber" readme = "README.md" version = "0.7.7" authors = ["Thom Wiggers "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" homepage = "https://github.com/rustpq/" repository = "https://github.com/rustpq/pqcrypto/" diff --git a/pqcrypto-sphincsplus/Cargo.toml b/pqcrypto-sphincsplus/Cargo.toml index eef71e0d..d2b373f7 100644 --- a/pqcrypto-sphincsplus/Cargo.toml +++ b/pqcrypto-sphincsplus/Cargo.toml @@ -4,7 +4,7 @@ description = "Post-Quantum Signature Scheme sphincsplus" readme = "README.md" version = "0.7.0" authors = ["Thom Wiggers "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" homepage = "https://github.com/rustpq/" repository = "https://github.com/rustpq/pqcrypto/" diff --git a/pqcrypto-template/scheme/Cargo.toml.j2 b/pqcrypto-template/scheme/Cargo.toml.j2 index 79826aa3..1e144e7a 100644 --- a/pqcrypto-template/scheme/Cargo.toml.j2 +++ b/pqcrypto-template/scheme/Cargo.toml.j2 @@ -4,7 +4,7 @@ description = "Post-Quantum {% if type == "kem" %}Key-Encapsulation Mechanism{% readme = "README.md" version = "{{ version }}" authors = ["Thom Wiggers "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" homepage = "https://github.com/rustpq/" repository = "https://github.com/rustpq/pqcrypto/" diff --git a/pqcrypto-template/workspace-Cargo.toml.j2 b/pqcrypto-template/workspace-Cargo.toml.j2 index a9f5c3d9..3922be8b 100644 --- a/pqcrypto-template/workspace-Cargo.toml.j2 +++ b/pqcrypto-template/workspace-Cargo.toml.j2 @@ -8,3 +8,4 @@ members=[ "{{ name }}", {% endfor %} ] +resolver="2"