Change features names

givre/Cargo.toml

@@ -41,6 +41,6 @@ spof = ["key-share/spof"]
 # Library doesn't have support of HD signing yet.
 hd-wallets = ["key-share/hd-wallets", "cggmp21-keygen?/hd-wallets"]
 
-all-curves = ["curve-secp256k1", "curve-ed25519"]
-curve-secp256k1 = ["generic-ec/curve-secp256k1", "k256", "sha2", "static_assertions"]
-curve-ed25519 = ["generic-ec/curve-ed25519", "sha2"]
+all-ciphersuites = ["ciphersuite-secp256k1", "ciphersuite-ed25519"]
+ciphersuite-secp256k1 = ["generic-ec/curve-secp256k1", "k256", "sha2", "static_assertions"]
+ciphersuite-ed25519 = ["generic-ec/curve-ed25519", "sha2"]

givre/src/ciphersuite.rs

@@ -3,22 +3,22 @@
 //! Ciphersuite specifies which curve and hash primitives to use during the signing.
 //!
 //! Out of the box, we provide ciphersuites defined the in the draft:
-//! * [Secp256k1], requires `curve-secp256k1` feature
-//! * [Ed25519], requires `curve-ed25519` feature
+//! * [Secp256k1], requires `ciphersuite-secp256k1` feature
+//! * [Ed25519], requires `ciphersuite-ed25519` feature
 use generic_ec::{
     errors::{InvalidPoint, InvalidScalar},
     Curve, Point, Scalar, SecretScalar,
 };
 use rand_core::{CryptoRng, RngCore};
 
-#[cfg(feature = "curve-ed25519")]
+#[cfg(feature = "ciphersuite-ed25519")]
 mod ed25519;
-#[cfg(feature = "curve-secp256k1")]
+#[cfg(feature = "ciphersuite-secp256k1")]
 mod secp256k1;
 
-#[cfg(feature = "curve-ed25519")]
+#[cfg(feature = "ciphersuite-ed25519")]
 pub use ed25519::Ed25519;
-#[cfg(feature = "curve-secp256k1")]
+#[cfg(feature = "ciphersuite-secp256k1")]
 pub use secp256k1::Secp256k1;
 
 /// Ciphersuite determines an underlying curve and set of cryptographic primitives

tests/Cargo.toml

@@ -7,7 +7,7 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-givre = { path = "../givre", features = ["all-curves", "cggmp21-keygen", "spof", "hd-wallets", "full-signing"] }
+givre = { path = "../givre", features = ["all-ciphersuites", "cggmp21-keygen", "spof", "hd-wallets", "full-signing"] }
 
 generic-tests = "0.1"
 test-case = "3.3"