Merge branch 'main' into update-dalek

Author: giarc3

.github/workflows/ci.yaml

@@ -41,11 +41,11 @@ jobs:
         - os: ubuntu-22.04
           target: wasm32-unknown-unknown
           features: --features wasm --no-default-features
-        - os: macos-12
+        - os: macos-13
           target: aarch64-apple-ios
-        - os: macos-12
+        - os: macos-13
           target: x86_64-apple-darwin # 64-bit OSX
-        - os: macos-12
+        - os: macos-14
           target: aarch64-apple-darwin # 64-bit M1 OSX
         - os: windows-2019
           target: x86_64-pc-windows-msvc
@@ -72,7 +72,7 @@ jobs:
         rust:
         - stable
         - beta
-        - 1.60.0 #MSRV
+        - 1.70.0 #MSRV
       fail-fast: false
     steps:
     - uses: actions/checkout@v2
@@ -116,7 +116,7 @@ jobs:
         args: -- --save-baseline ${{ matrix.name }}
     - run: critcmp --export ${{ matrix.name }} > results.json
     - name: Store benchmark results
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: bench-${{ matrix.name }}
         path: results.json
@@ -132,7 +132,7 @@ jobs:
     - name: Cache cargo
       uses: Swatinem/rust-cache@v1
     - name: Retrieve benchmark results
-      uses: actions/download-artifact@v1
+      uses: actions/download-artifact@v4
       with:
         name: bench-current
     - name: Delete artifact
@@ -141,7 +141,7 @@ jobs:
         name: bench-current
         failOnError: false
     - name: Retrieve benchmark results
-      uses: actions/download-artifact@v1
+      uses: actions/download-artifact@v4
       with:
         name: bench-base
     - name: Delete artifact

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- [[#184](https://github.com/IronCoreLabs/recrypt-rs/pull/184)]
+  - Change MSRV to Rust 1.70.0
 - [[#177](https://github.com/IronCoreLabs/recrypt-rs/pull/177)]
   - Change MSRV to Rust 1.60.0
 - [[#175](https://github.com/IronCoreLabs/recrypt-rs/pull/175)]

Cargo.toml

@@ -10,7 +10,7 @@ categories = ["cryptography", "algorithms"]
 keywords = ["cryptography", "proxy-re-encryption", "PRE", "ECC", "transform-encryption"]
 description = "A pure-Rust implementation of Transform Encryption, a Proxy Re-encryption scheme"
 edition = "2021"
-rust-version = "1.60.0"
+rust-version = "1.70.0"
 
 [target.'cfg(all(unix, not(target_arch = "wasm32")))'.dependencies]
 libc = {version = "0.2"}

README.md

@@ -202,6 +202,12 @@ Recrypt-rust incorporates technology that is protected by the following patents
 - EP3616384A4 - Orthogonal Access Control for Groups via Multi-Hop Transform Encryption
 - KR20200027921 A - Orthogonal Access Control for Groups via Multi-Hop Transform Encryption
 
+# Cryptography Notice
+
+This repository includes cryptographic software. The country in which you currently reside may have restrictions on the import, possession, use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check your country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted. See https://www.wassenaar.org/ for more information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and Security (BIS), has classified this software as Export Commodity Control Number (ECCN) 5D002, which includes information security software using or performing cryptographic functions. The form and manner of this distribution makes it eligible for export under the License Exception ENC (see the BIS Export Administration Regulations, Section 740.17.B.3.i.B and also the publicly available source code exemption, under 742.15; notice has been given to BIS and NSA).
+
 # License
 
 Recrypt-rust is licensed under the [GNU Affero General Public License](LICENSE).

flake.nix

@@ -20,7 +20,7 @@
           buildInputs = with pkgs;
             [ rusttoolchain pkg-config ]
             ++ pkgs.lib.optionals pkgs.stdenv.isDarwin
-            [ pkgs.darwin.apple_sdk.frameworks.Security ];
+            [ pkgs.darwin.apple_sdk.frameworks.SystemConfiguration ];
         };
 
       });