Merge pull request #9 from supinie/seeds

default behaviour seed over key for private key

.envrc

@@ -0,0 +1 @@
+use nix

.github/workflows/build.yml

@@ -33,6 +33,11 @@ jobs:
         env:
           RUST_BACKTRACE: 1
 
+      - name: cargo test all
+        run: cargo test --all-features || cargo test --all-features || cargo test --all-features
+        env:
+          RUST_BACKTRACE: 1
+
       - name: Get coverage
         run: ./.github/coverage --lcov --output-path cov_report || ./.github/coverage --lcov --output-path cov_report || ./.github/coverage --lcov --output-path cov_report
 

.gitignore

@@ -21,3 +21,5 @@ proptest-regressions
 
 # Flamegraph
 benches/flamegraph/
+
+.direnv/

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "enc_rust"
-version = "0.1.4"
+version = "0.2.0"
 edition = "2021"
 authors = ["supinie <[email protected]>"]
 
@@ -16,6 +16,10 @@ license = "GPL-3.0-or-later"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[features]
+default = []
+decap_key = [] # Use the true key instead of seed for PrivateKey. Default uses seed.
+
 [profile.release]
 opt-level = "s"
 lto = false

shell.nix

@@ -0,0 +1,4 @@
+with import <nixpkgs> {};
+mkShell {
+    buildInputs = [ rustup gcc bacon ];
+}

src/errors.rs

@@ -13,7 +13,7 @@ pub enum CrystalsError {
     InvalidSeedLength(usize, usize),
     InternalError(),
     InvalidK(usize),
-    InvalidCiphertextLength(usize, usize, K),
+    InvalidCiphertextLength(usize),
 }
 
 impl Display for CrystalsError {
@@ -24,7 +24,7 @@ impl Display for CrystalsError {
             Self::InvalidSeedLength(seed_len, expected_seed_len) => write!(f, "Invalid seed length, expected {expected_seed_len}, got {seed_len}"),
             Self::InternalError() => write!(f, "Unexpected internal error"),
             Self::InvalidK(k) => write!(f, "Recieved invalid k value, {k}, expected 2, 3, or 4"),
-            Self::InvalidCiphertextLength(ciphertext_len, expected_ciphertext_len, sec_level) => write!(f, "Invalid ciphertext length, expected {expected_ciphertext_len}, got {ciphertext_len} (key security level: {sec_level})"),
+            Self::InvalidCiphertextLength(ciphertext_len) => write!(f, "Invalid ciphertext length, expected 768, 1088, or 1568, got {ciphertext_len}"),
         }
     }
 }
@@ -96,6 +96,7 @@ impl From<rand_core::Error> for KeyGenerationError {
 #[derive(Debug)]
 pub enum EncryptionDecryptionError {
     Crystals(CrystalsError),
+    KeyGenerationError(KeyGenerationError),
     TryFromInt(TryFromIntError),
     Packing(PackingError),
     Rand(rand_core::Error),
@@ -107,6 +108,12 @@ impl From<CrystalsError> for EncryptionDecryptionError {
     }
 }
 
+impl From<KeyGenerationError> for EncryptionDecryptionError {
+    fn from(error: KeyGenerationError) -> Self {
+        Self::KeyGenerationError(error)
+    }
+}
+
 impl From<TryFromIntError> for EncryptionDecryptionError {
     fn from(error: TryFromIntError) -> Self {
         Self::TryFromInt(error)

src/indcpa.rs

@@ -26,11 +26,13 @@ impl PrivateKey {
     }
 
     // buf should be of length indcpa_private_key_bytes
+    #[cfg(feature = "decap_key")]
     pub(crate) fn pack(&self, buf: &mut [u8]) -> Result<(), PackingError> {
         self.secret.pack(buf)
     }
 
     // buf should be of length indcpa_private_key_bytes
+    #[cfg(feature = "decap_key")]
     pub(crate) fn unpack(buf: &[u8]) -> Result<Self, PackingError> {
         let secret = PolyVec::unpack(buf)?.normalise();
         Ok(Self { secret })