From 81002499e3df842146506b517aee2bf0b44118e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= Date: Mon, 24 Mar 2025 01:03:38 +0300 Subject: [PATCH 1/4] Rename `ascon-aead` to `ascon-aead128` --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- {ascon-aead => ascon-aead128}/CHANGELOG.md | 0 {ascon-aead => ascon-aead128}/Cargo.toml | 11 ++++------- {ascon-aead => ascon-aead128}/LICENSE-APACHE | 0 {ascon-aead => ascon-aead128}/LICENSE-MIT | 0 {ascon-aead => ascon-aead128}/README.md | 0 {ascon-aead => ascon-aead128}/src/asconcore.rs | 0 {ascon-aead => ascon-aead128}/src/lib.rs | 4 ++-- .../tests/data/reference_kats.blb | Bin .../tests/reference_kats.rs | 2 +- 11 files changed, 10 insertions(+), 13 deletions(-) rename {ascon-aead => ascon-aead128}/CHANGELOG.md (100%) rename {ascon-aead => ascon-aead128}/Cargo.toml (78%) rename {ascon-aead => ascon-aead128}/LICENSE-APACHE (100%) rename {ascon-aead => ascon-aead128}/LICENSE-MIT (100%) rename {ascon-aead => ascon-aead128}/README.md (100%) rename {ascon-aead => ascon-aead128}/src/asconcore.rs (100%) rename {ascon-aead => ascon-aead128}/src/lib.rs (98%) rename {ascon-aead => ascon-aead128}/tests/data/reference_kats.blb (100%) rename {ascon-aead => ascon-aead128}/tests/reference_kats.rs (99%) diff --git a/Cargo.lock b/Cargo.lock index 3d89fdcc..a4942bfc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -93,8 +93,8 @@ dependencies = [ ] [[package]] -name = "ascon-aead" -version = "0.4.2" +name = "ascon-aead128" +version = "0.1.0" dependencies = [ "aead", "ascon", diff --git a/Cargo.toml b/Cargo.toml index bfec3ed2..90227456 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ members = [ "aes-gcm", "aes-gcm-siv", "aes-siv", - "ascon-aead", + "ascon-aead128", "ccm", "chacha20poly1305", "deoxys", diff --git a/ascon-aead/CHANGELOG.md b/ascon-aead128/CHANGELOG.md similarity index 100% rename from ascon-aead/CHANGELOG.md rename to ascon-aead128/CHANGELOG.md diff --git a/ascon-aead/Cargo.toml b/ascon-aead128/Cargo.toml similarity index 78% rename from ascon-aead/Cargo.toml rename to ascon-aead128/Cargo.toml index 8712ed40..028320fb 100644 --- a/ascon-aead/Cargo.toml +++ b/ascon-aead128/Cargo.toml @@ -1,11 +1,8 @@ [package] -name = "ascon-aead" -version = "0.4.2" -description = "Implementation of the authenticated encryption schemes Ascon-128, Ascon-128a, and Ascon-80pq" -authors = [ - "Sebastian Ramacher ", - "RustCrypto Developers", -] +name = "ascon-aead128" +version = "0.1.0" +description = "Implementation of the Ascon-AEAD128 authenticated encryption scheme" +authors = ["RustCrypto Developers"] edition = "2024" license = "Apache-2.0 OR MIT" readme = "README.md" diff --git a/ascon-aead/LICENSE-APACHE b/ascon-aead128/LICENSE-APACHE similarity index 100% rename from ascon-aead/LICENSE-APACHE rename to ascon-aead128/LICENSE-APACHE diff --git a/ascon-aead/LICENSE-MIT b/ascon-aead128/LICENSE-MIT similarity index 100% rename from ascon-aead/LICENSE-MIT rename to ascon-aead128/LICENSE-MIT diff --git a/ascon-aead/README.md b/ascon-aead128/README.md similarity index 100% rename from ascon-aead/README.md rename to ascon-aead128/README.md diff --git a/ascon-aead/src/asconcore.rs b/ascon-aead128/src/asconcore.rs similarity index 100% rename from ascon-aead/src/asconcore.rs rename to ascon-aead128/src/asconcore.rs diff --git a/ascon-aead/src/lib.rs b/ascon-aead128/src/lib.rs similarity index 98% rename from ascon-aead/src/lib.rs rename to ascon-aead128/src/lib.rs index 04690b43..7fde3c03 100644 --- a/ascon-aead/src/lib.rs +++ b/ascon-aead128/src/lib.rs @@ -13,8 +13,8 @@ //! //! ``` //! # #[cfg(feature = "alloc")] { -//! use ascon_aead::{AsconAead128, Key, Nonce}; -//! use ascon_aead::aead::{Aead, KeyInit}; +//! use ascon_aead128::{AsconAead128, Key, Nonce}; +//! use ascon_aead128::aead::{Aead, KeyInit}; //! //! let key = Key::::from_slice(b"very secret key."); //! let cipher = AsconAead128::new(key); diff --git a/ascon-aead/tests/data/reference_kats.blb b/ascon-aead128/tests/data/reference_kats.blb similarity index 100% rename from ascon-aead/tests/data/reference_kats.blb rename to ascon-aead128/tests/data/reference_kats.blb diff --git a/ascon-aead/tests/reference_kats.rs b/ascon-aead128/tests/reference_kats.rs similarity index 99% rename from ascon-aead/tests/reference_kats.rs rename to ascon-aead128/tests/reference_kats.rs index dc67da3b..acea50cd 100644 --- a/ascon-aead/tests/reference_kats.rs +++ b/ascon-aead128/tests/reference_kats.rs @@ -1,5 +1,5 @@ #![cfg(feature = "alloc")] // TODO: remove after migration to the new `aead` crate -use ascon_aead::{ +use ascon_aead128::{ AsconAead128, aead::{Aead, KeyInit, Nonce, Payload, dev::blobby}, }; From 5bd61d947ebfd5d40e5cbb1cffbb2ddf1796a641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= Date: Mon, 24 Mar 2025 01:09:12 +0300 Subject: [PATCH 2/4] Fix Ci --- .github/workflows/{ascon-aead.yml => ascon-aead128.yml} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename .github/workflows/{ascon-aead.yml => ascon-aead128.yml} (93%) diff --git a/.github/workflows/ascon-aead.yml b/.github/workflows/ascon-aead128.yml similarity index 93% rename from .github/workflows/ascon-aead.yml rename to .github/workflows/ascon-aead128.yml index c0cc9f82..b41e8ab1 100644 --- a/.github/workflows/ascon-aead.yml +++ b/.github/workflows/ascon-aead128.yml @@ -1,17 +1,17 @@ -name: ascon-aead +name: ascon-aead128 on: pull_request: paths: - - ".github/workflows/ascon-aead.yml" - - "ascon-aead/**" + - ".github/workflows/ascon-aead128.yml" + - "ascon-aead128/**" - "Cargo.*" push: branches: master defaults: run: - working-directory: ascon-aead + working-directory: ascon-aead128 env: CARGO_INCREMENTAL: 0 From ef08c729776dd676958b34e53f84c3e8bc0ce8ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= Date: Mon, 24 Mar 2025 01:14:47 +0300 Subject: [PATCH 3/4] Fix doctest --- ascon-aead128/src/lib.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ascon-aead128/src/lib.rs b/ascon-aead128/src/lib.rs index 7fde3c03..048008b2 100644 --- a/ascon-aead128/src/lib.rs +++ b/ascon-aead128/src/lib.rs @@ -35,8 +35,8 @@ //! //! ``` //! # #[cfg(feature = "getrandom")] { -//! use ascon_aead::AsconAead128; -//! use ascon_aead::aead::{Aead, AeadCore, KeyInit, OsRng}; +//! use ascon_aead128::AsconAead128; +//! use ascon_aead128::aead::{Aead, AeadCore, KeyInit, OsRng}; //! //! let key = AsconAead128::generate_key().expect("generate key"); //! let cipher = AsconAead128::new(&key); @@ -70,9 +70,9 @@ //! //! ``` //! # #[cfg(feature = "heapless")] { -//! use ascon_aead::{AsconAead128, Key, Nonce}; -//! use ascon_aead::aead::{AeadInPlace, KeyInit}; -//! use ascon_aead::aead::heapless::Vec; +//! use ascon_aead128::{AsconAead128, Key, Nonce}; +//! use ascon_aead128::aead::{AeadInPlace, KeyInit}; +//! use ascon_aead128::aead::heapless::Vec; //! //! let key = Key::::from_slice(b"very secret key."); //! let cipher = AsconAead128::new(key); From 9f4cf58dfc4c3bbc9cc715664773cf4daa97bd1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= Date: Mon, 24 Mar 2025 01:39:48 +0300 Subject: [PATCH 4/4] Remove license headers --- ascon-aead128/src/asconcore.rs | 3 --- ascon-aead128/src/lib.rs | 3 --- 2 files changed, 6 deletions(-) diff --git a/ascon-aead128/src/asconcore.rs b/ascon-aead128/src/asconcore.rs index 2cd828bf..4f1613a5 100644 --- a/ascon-aead128/src/asconcore.rs +++ b/ascon-aead128/src/asconcore.rs @@ -1,6 +1,3 @@ -// Copyright 2021-2023 Sebastian Ramacher -// SPDX-License-Identifier: Apache-2.0 OR MIT - use aead::{ Error, array::{Array, ArraySize}, diff --git a/ascon-aead128/src/lib.rs b/ascon-aead128/src/lib.rs index 382b1e91..048008b2 100644 --- a/ascon-aead128/src/lib.rs +++ b/ascon-aead128/src/lib.rs @@ -1,6 +1,3 @@ -// Copyright 2021-2023 Sebastian Ramacher -// SPDX-License-Identifier: Apache-2.0 OR MIT - #![no_std] #![cfg_attr(docsrs, feature(doc_auto_cfg))] #![doc = include_str!("../README.md")]