Fix build dependencies with ECC in ossl

Signed-off-by: Simo Sorce <[email protected]>

Cargo.toml

@@ -48,10 +48,11 @@ zeroize = "1.6.0"
 
 [features]
 aes = []
-ecdsa = []
-ecdh = []
-eddsa = []
-ec_montgomery = []
+ecc = []
+ecdsa = ["ecc"]
+ecdh = ["ecc"]
+eddsa = ["ecc"]
+ec_montgomery = ["ecc"]
 hash = []
 hkdf = []
 hmac = ["hash"]
@@ -69,7 +70,9 @@ sqlitedb = ["dep:rusqlite"]
 # these are always required, so easier to specify this way
 default = [ "aes", "hmac", "pbkdf2", "sqlitedb" ]
 
-standard = [ "ecdsa", "ec_montgomery", "eddsa", "ecdh", "hash", "hkdf", "rsa", "sp800_108", "sshkdf", "tlskdf"]
+ecc_all = ["ecdsa", "ec_montgomery", "eddsa", "ecdh"]
+
+standard = [ "ecc_all", "hash", "hkdf", "rsa", "sp800_108", "sshkdf", "tlskdf"]
 
 fips = [ "rusqlite/bundled", "ecdsa", "ecdh", "hash", "hkdf", "rsa", "sp800_108", "sshkdf", "tlskdf"]
 

src/enabled.rs

@@ -13,7 +13,7 @@ compile_error!("Feature 'ecdh' requires either 'ecdsa' or 'ec_montgomery'");
 #[cfg(feature = "aes")]
 mod aes;
 
-#[cfg(any(feature = "ecdsa", feature = "eddsa", feature = "ec_montgomery"))]
+#[cfg(feature = "ecc")]
 mod ec;
 
 #[cfg(feature = "hash")]

src/ossl/common.rs

@@ -4,7 +4,6 @@
 use std::borrow::Cow;
 use std::ffi::{c_char, c_int, c_uint, c_void};
 
-use crate::ec::get_oid_from_obj;
 use crate::error::Result;
 use crate::interface::*;
 use crate::kasn1::oid;
@@ -13,6 +12,8 @@ use crate::ossl::bindings::*;
 use crate::ossl::get_libctx;
 use crate::{byte_ptr, void_ptr};
 
+#[cfg(feature = "ecc")]
+use crate::ec::get_oid_from_obj;
 #[cfg(feature = "ecdsa")]
 use crate::ossl::ecdsa;
 #[cfg(feature = "eddsa")]
@@ -886,6 +887,7 @@ fn oid_to_ossl_name(oid: &asn1::ObjectIdentifier) -> Result<&'static [u8]> {
     }
 }
 
+#[cfg(feature = "ecc")]
 pub fn get_ossl_name_from_obj(key: &Object) -> Result<&'static [u8]> {
     oid_to_ossl_name(&get_oid_from_obj(key)?)
 }