From 86300ca9367adf9863e8af098dd0b8a4548e4b37 Mon Sep 17 00:00:00 2001
From: Karolin Varner <karo@cupdev.net>
Date: Mon, 20 Nov 2023 10:44:26 +0100
Subject: [PATCH] chore: Use naming scheme without rosenpass- for crates

---
 Cargo.toml                                                | 8 ++++----
 {rosenpass-ciphers => ciphers}/Cargo.toml                 | 2 +-
 {rosenpass-ciphers => ciphers}/readme.md                  | 0
 {rosenpass-ciphers => ciphers}/src/lib.rs                 | 0
 {rosenpass-constant-time => constant-time}/Cargo.toml     | 0
 {rosenpass-constant-time => constant-time}/readme.md      | 0
 {rosenpass-constant-time => constant-time}/src/lib.rs     | 0
 rosenpass/Cargo.toml                                      | 8 ++++----
 {rosenpass-sodium => sodium}/Cargo.toml                   | 2 +-
 {rosenpass-sodium => sodium}/readme.md                    | 0
 .../src/aead/chacha20poly1305_ietf.rs                     | 0
 {rosenpass-sodium => sodium}/src/aead/mod.rs              | 0
 .../src/aead/xchacha20poly1305_ietf.rs                    | 0
 {rosenpass-sodium => sodium}/src/helpers.rs               | 0
 {rosenpass-sodium => sodium}/src/lib.rs                   | 0
 {rosenpass-util => util}/Cargo.toml                       | 0
 {rosenpass-util => util}/src/b64.rs                       | 0
 {rosenpass-util => util}/src/file.rs                      | 0
 {rosenpass-util => util}/src/functional.rs                | 0
 {rosenpass-util => util}/src/lib.rs                       | 0
 {rosenpass-util => util}/src/mem.rs                       | 0
 {rosenpass-util => util}/src/ord.rs                       | 0
 {rosenpass-util => util}/src/result.rs                    | 0
 {rosenpass-util => util}/src/time.rs                      | 0
 24 files changed, 10 insertions(+), 10 deletions(-)
 rename {rosenpass-ciphers => ciphers}/Cargo.toml (88%)
 rename {rosenpass-ciphers => ciphers}/readme.md (100%)
 rename {rosenpass-ciphers => ciphers}/src/lib.rs (100%)
 rename {rosenpass-constant-time => constant-time}/Cargo.toml (100%)
 rename {rosenpass-constant-time => constant-time}/readme.md (100%)
 rename {rosenpass-constant-time => constant-time}/src/lib.rs (100%)
 rename {rosenpass-sodium => sodium}/Cargo.toml (91%)
 rename {rosenpass-sodium => sodium}/readme.md (100%)
 rename {rosenpass-sodium => sodium}/src/aead/chacha20poly1305_ietf.rs (100%)
 rename {rosenpass-sodium => sodium}/src/aead/mod.rs (100%)
 rename {rosenpass-sodium => sodium}/src/aead/xchacha20poly1305_ietf.rs (100%)
 rename {rosenpass-sodium => sodium}/src/helpers.rs (100%)
 rename {rosenpass-sodium => sodium}/src/lib.rs (100%)
 rename {rosenpass-util => util}/Cargo.toml (100%)
 rename {rosenpass-util => util}/src/b64.rs (100%)
 rename {rosenpass-util => util}/src/file.rs (100%)
 rename {rosenpass-util => util}/src/functional.rs (100%)
 rename {rosenpass-util => util}/src/lib.rs (100%)
 rename {rosenpass-util => util}/src/mem.rs (100%)
 rename {rosenpass-util => util}/src/ord.rs (100%)
 rename {rosenpass-util => util}/src/result.rs (100%)
 rename {rosenpass-util => util}/src/time.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 9bf207f..579af31 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,10 +3,10 @@ resolver = "2"
 
 members = [
     "rosenpass",
-    "rosenpass-ciphers",
-    "rosenpass-util",
-    "rosenpass-constant-time",
-    "rosenpass-sodium",
+    "ciphers",
+    "util",
+    "constant-time",
+    "sodium",
 ]
 
 [workspace.metadata.release]
diff --git a/rosenpass-ciphers/Cargo.toml b/ciphers/Cargo.toml
similarity index 88%
rename from rosenpass-ciphers/Cargo.toml
rename to ciphers/Cargo.toml
index d147974..a84ba2f 100644
--- a/rosenpass-ciphers/Cargo.toml
+++ b/ciphers/Cargo.toml
@@ -10,4 +10,4 @@ repository = "https://github.com/rosenpass/rosenpass"
 readme = "readme.md"
 
 [dependencies]
-rosenpass-sodium = { path = "../rosenpass-sodium" }
+rosenpass-sodium = { path = "../sodium" }
diff --git a/rosenpass-ciphers/readme.md b/ciphers/readme.md
similarity index 100%
rename from rosenpass-ciphers/readme.md
rename to ciphers/readme.md
diff --git a/rosenpass-ciphers/src/lib.rs b/ciphers/src/lib.rs
similarity index 100%
rename from rosenpass-ciphers/src/lib.rs
rename to ciphers/src/lib.rs
diff --git a/rosenpass-constant-time/Cargo.toml b/constant-time/Cargo.toml
similarity index 100%
rename from rosenpass-constant-time/Cargo.toml
rename to constant-time/Cargo.toml
diff --git a/rosenpass-constant-time/readme.md b/constant-time/readme.md
similarity index 100%
rename from rosenpass-constant-time/readme.md
rename to constant-time/readme.md
diff --git a/rosenpass-constant-time/src/lib.rs b/constant-time/src/lib.rs
similarity index 100%
rename from rosenpass-constant-time/src/lib.rs
rename to constant-time/src/lib.rs
diff --git a/rosenpass/Cargo.toml b/rosenpass/Cargo.toml
index 197c439..7fa2c5b 100644
--- a/rosenpass/Cargo.toml
+++ b/rosenpass/Cargo.toml
@@ -14,10 +14,10 @@ name = "handshake"
 harness = false
 
 [dependencies]
-rosenpass-util = { path = "../rosenpass-util" }
-rosenpass-constant-time = { path = "../rosenpass-constant-time" }
-rosenpass-sodium = { path = "../rosenpass-sodium" }
-rosenpass-ciphers = { path = "../rosenpass-ciphers" }
+rosenpass-util = { path = "../util" }
+rosenpass-constant-time = { path = "../constant-time" }
+rosenpass-sodium = { path = "../sodium" }
+rosenpass-ciphers = { path = "../ciphers" }
 anyhow = { version = "1.0.71", features = ["backtrace"] }
 static_assertions = "1.1.0"
 memoffset = "0.9.0"
diff --git a/rosenpass-sodium/Cargo.toml b/sodium/Cargo.toml
similarity index 91%
rename from rosenpass-sodium/Cargo.toml
rename to sodium/Cargo.toml
index 91229da..1cd3bea 100644
--- a/rosenpass-sodium/Cargo.toml
+++ b/sodium/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://github.com/rosenpass/rosenpass"
 readme = "readme.md"
 
 [dependencies]
-rosenpass-util = { path = "../rosenpass-util" }
+rosenpass-util = { path = "../util" }
 anyhow = { version = "1.0.71", features = ["backtrace"] }
 libsodium-sys-stable = { version = "1.19.28", features = ["use-pkg-config"] }
 log = { version = "0.4.17" }
diff --git a/rosenpass-sodium/readme.md b/sodium/readme.md
similarity index 100%
rename from rosenpass-sodium/readme.md
rename to sodium/readme.md
diff --git a/rosenpass-sodium/src/aead/chacha20poly1305_ietf.rs b/sodium/src/aead/chacha20poly1305_ietf.rs
similarity index 100%
rename from rosenpass-sodium/src/aead/chacha20poly1305_ietf.rs
rename to sodium/src/aead/chacha20poly1305_ietf.rs
diff --git a/rosenpass-sodium/src/aead/mod.rs b/sodium/src/aead/mod.rs
similarity index 100%
rename from rosenpass-sodium/src/aead/mod.rs
rename to sodium/src/aead/mod.rs
diff --git a/rosenpass-sodium/src/aead/xchacha20poly1305_ietf.rs b/sodium/src/aead/xchacha20poly1305_ietf.rs
similarity index 100%
rename from rosenpass-sodium/src/aead/xchacha20poly1305_ietf.rs
rename to sodium/src/aead/xchacha20poly1305_ietf.rs
diff --git a/rosenpass-sodium/src/helpers.rs b/sodium/src/helpers.rs
similarity index 100%
rename from rosenpass-sodium/src/helpers.rs
rename to sodium/src/helpers.rs
diff --git a/rosenpass-sodium/src/lib.rs b/sodium/src/lib.rs
similarity index 100%
rename from rosenpass-sodium/src/lib.rs
rename to sodium/src/lib.rs
diff --git a/rosenpass-util/Cargo.toml b/util/Cargo.toml
similarity index 100%
rename from rosenpass-util/Cargo.toml
rename to util/Cargo.toml
diff --git a/rosenpass-util/src/b64.rs b/util/src/b64.rs
similarity index 100%
rename from rosenpass-util/src/b64.rs
rename to util/src/b64.rs
diff --git a/rosenpass-util/src/file.rs b/util/src/file.rs
similarity index 100%
rename from rosenpass-util/src/file.rs
rename to util/src/file.rs
diff --git a/rosenpass-util/src/functional.rs b/util/src/functional.rs
similarity index 100%
rename from rosenpass-util/src/functional.rs
rename to util/src/functional.rs
diff --git a/rosenpass-util/src/lib.rs b/util/src/lib.rs
similarity index 100%
rename from rosenpass-util/src/lib.rs
rename to util/src/lib.rs
diff --git a/rosenpass-util/src/mem.rs b/util/src/mem.rs
similarity index 100%
rename from rosenpass-util/src/mem.rs
rename to util/src/mem.rs
diff --git a/rosenpass-util/src/ord.rs b/util/src/ord.rs
similarity index 100%
rename from rosenpass-util/src/ord.rs
rename to util/src/ord.rs
diff --git a/rosenpass-util/src/result.rs b/util/src/result.rs
similarity index 100%
rename from rosenpass-util/src/result.rs
rename to util/src/result.rs
diff --git a/rosenpass-util/src/time.rs b/util/src/time.rs
similarity index 100%
rename from rosenpass-util/src/time.rs
rename to util/src/time.rs