Housekeeping

.github/workflows/umbral-pre.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.70.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - wasm32-unknown-unknown
@@ -45,7 +45,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.70.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -63,7 +63,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.70.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v2
@@ -79,7 +79,7 @@ jobs:
       matrix:
         include:
           - target: x86_64-unknown-linux-gnu
-            rust: 1.70.0 # MSRV
+            rust: 1.81.0 # MSRV
           - target: x86_64-unknown-linux-gnu
             rust: stable
 
@@ -124,7 +124,7 @@ jobs:
         run: pip install mypy ruff
 
       - name: Run mypy.stubtest
-        run: python -m mypy.stubtest umbral_pre --allowlist stubtest-allowlist.txt
+        run: python -m mypy.stubtest umbral_pre
         working-directory: umbral-pre-python
 
       - name: Run ruff

CHANGELOG.md

@@ -10,9 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `SecretKey::try_from_be_bytes()` takes just a slice reference instead of a `SecretBox`. ([#134])
 - Bumped MSRV to 1.70. ([#134])
+- Bumped MSRV to 1.81. ([#135])
 
 
 [#134]: https://github.com/nucypher/rust-umbral/pull/134
+[#135]: https://github.com/nucypher/rust-umbral/pull/135
 
 
 ## [0.11.0] - 2023-08-01

Cargo.toml

@@ -4,3 +4,4 @@ members = [
     "umbral-pre-wasm",
     "umbral-pre-python",
 ]
+resolver = "2"

umbral-pre-python/Cargo.toml

@@ -13,4 +13,4 @@ umbral-pre = { path = "../umbral-pre", features = ["bindings-python"] }
 # Unfortunately, we (for the time being?) cannot use a re-exported `pyo3`
 # from the main `umbral-pre`, since `pyo3` macros and `pip` build need an explicit dependency.
 # This version has to be matched with the one in `umbral-pre`.
-pyo3 = "0.18"
+pyo3 = "0.27"

umbral-pre-python/src/lib.rs

@@ -4,7 +4,7 @@ use umbral_pre::bindings_python::*;
 
 /// A Python module implemented in Rust.
 #[pymodule]
-fn _umbral(py: Python, m: &PyModule) -> PyResult<()> {
+fn _umbral(py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<SecretKey>()?;
     m.add_class::<SecretKeyFactory>()?;
     m.add_class::<PublicKey>()?;

umbral-pre-python/umbral_pre/__init__.pyi

@@ -64,7 +64,7 @@ class PublicKey:
 @final
 class Signer:
 
-    def __init__(self, secret_key: SecretKey):
+    def __new__(cls, secret_key: SecretKey):
         ...
 
     def sign(self, message: bytes) -> Signature:
@@ -237,7 +237,7 @@ class CurvePoint:
 @final
 class Parameters:
 
-    def __init__(self) -> None:
+    def __new__(cls):
         ...
 
     u: CurvePoint
@@ -246,8 +246,8 @@ class Parameters:
 @final
 class ReencryptionEvidence:
 
-    def __init__(
-            self,
+    def __new__(
+            cls,
             capsule: Capsule,
             vcfrag: VerifiedCapsuleFrag,
             verifying_pk: PublicKey,

umbral-pre/Cargo.toml

@@ -8,6 +8,7 @@ description = "Implementation of Umbral proxy reencryption algorithm"
 repository = "https://github.com/nucypher/rust-umbral/tree/master/umbral-pre"
 readme = "README.md"
 categories = ["cryptography", "no-std"]
+rust-version = "1.81"
 
 [dependencies]
 k256 = { version = "0.13", default-features = false, features = ["ecdsa", "arithmetic", "hash2curve"] }
@@ -18,24 +19,27 @@ hex = { version = "0.4", default-features = false, features = ["alloc"] }
 serde = { version = "1", default-features = false, features = ["derive"], optional = true }
 base64 = { version = "0.21", default-features = false, features = ["alloc"] }
 rmp-serde = { version = "1", optional = true }
-pyo3 = { version = "0.18", optional = true }
+pyo3 = { version = "0.27", optional = true }
 js-sys = { version = "0.3.63", optional = true }
 wasm-bindgen = { version = "0.2.86", optional = true }
-derive_more = { version = "0.99", optional = true, default_features = false, features = ["as_ref", "from", "into"] }
-wasm-bindgen-derive = { version = "0.2.0", optional = true }
+derive_more = { version = "0.99", optional = true, default-features = false, features = ["as_ref", "from", "into"] }
+wasm-bindgen-derive = { version = "0.3", optional = true }
+serde-encoded-bytes = { version = "0.2", optional = true, features = ["hex", "generic-array-014"] }
+secrecy = { version = "0.10",  default-features = false }
 
 # These packages are among the dependencies of the packages above.
 # Their versions should be updated when the main packages above are updated.
-generic-array = { version = "0.14.6", features = ["zeroize"] }
+generic-array = { version = "=0.14.7", features = ["zeroize"] }
 rand_core = { version = "0.6", default-features = false }
 getrandom = { version = "0.2", optional = true, default-features = false }
 subtle = { version = "2.4", default-features = false }
-zeroize = { version = "1.5", default-features = false, features = ["derive"] }
+zeroize = { version = "1.8", default-features = false, features = ["derive"] }
 
 [dev-dependencies]
 criterion = { version = "=0.4.0", features = ["html_reports"] } # forcing version to avoid bumping MSRV
 serde_json = "1"
 rmp-serde = "1"
+rand_chacha = "0.3"
 
 [features]
 default = ["default-rng"]
@@ -44,7 +48,7 @@ bindings-python = ["pyo3", "std", "derive_more", "default-serialization"]
 bindings-wasm = ["js-sys", "default-serialization", "wasm-bindgen", "derive_more", "wasm-bindgen-derive", "getrandom/js"]
 default-rng = ["getrandom", "rand_core/getrandom"]
 default-serialization = ["serde", "rmp-serde"]
-serde = ["dep:serde"]
+serde = ["dep:serde", "serde-encoded-bytes"]
 std = []
 
 # What features to use when building documentation on docs.rs

umbral-pre/src/bench.rs

@@ -3,11 +3,11 @@
 //! Should not be used by regular users.
 
 use rand_core::OsRng;
+use secrecy::SecretBox;
 
 use crate::capsule::{Capsule, KeySeed, OpenReencryptedError};
 use crate::capsule_frag::CapsuleFrag;
 use crate::keys::{PublicKey, SecretKey};
-use crate::secret_box::SecretBox;
 
 /// Exported `Capsule::from_public_key()` for benchmark purposes.
 pub fn capsule_from_public_key(delegating_pk: &PublicKey) -> (Capsule, SecretBox<KeySeed>) {