Skip to content

feat(sec1): add default cargo feature for disabling point module #516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tarcieri merged 1 commit into from
Mar 17, 2022
Merged

feat(sec1): add default cargo feature for disabling point module #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sec1/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ edition = "2021"
rust-version = "1.57"

[dependencies]
generic-array = { version = "0.14.4", default-features = false }

# optional dependencies
der = { version = "=0.6.0-pre.3", optional = true, features = ["oid"], path = "../der" }
generic-array = { version = "0.14.4", optional = true, default-features = false }
pkcs8 = { version = "=0.9.0-pre.1", optional = true, default-features = false, path = "../pkcs8" }
serde = { version = "1.0.16", optional = true, default-features = false }
subtle = { version = "2", optional = true, default-features = false }
Expand All @@ -29,9 +28,10 @@ zeroize = { version = "1", optional = true, default-features = false }
hex-literal = "0.3"

[features]
default = ["der"]
default = ["der", "point"]
alloc = ["der/alloc", "pkcs8/alloc", "zeroize/alloc"]
pem = ["alloc", "der/pem", "pkcs8/pem"]
point = ["generic-array"]
std = ["der/std", "alloc"]

[package.metadata.docs.rs]
Expand Down
14 changes: 8 additions & 6 deletions sec1/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ extern crate alloc;
#[cfg(feature = "std")]
extern crate std;

#[cfg(feature = "point")]
pub mod point;

mod error;
Expand All @@ -36,16 +37,17 @@ mod traits;
#[cfg(feature = "der")]
pub use der;

pub use crate::{
error::{Error, Result},
point::EncodedPoint,
};
pub use crate::error::{Error, Result};

#[cfg(feature = "der")]
pub use crate::{parameters::EcParameters, private_key::EcPrivateKey, traits::DecodeEcPrivateKey};
#[cfg(feature = "point")]
pub use crate::point::EncodedPoint;

#[cfg(feature = "point")]
pub use generic_array::typenum::consts;

#[cfg(feature = "der")]
pub use crate::{parameters::EcParameters, private_key::EcPrivateKey, traits::DecodeEcPrivateKey};

#[cfg(feature = "alloc")]
pub use crate::{private_key::document::EcPrivateKeyDocument, traits::EncodeEcPrivateKey};

Expand Down
2 changes: 1 addition & 1 deletion ssh-key/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pem-rfc7468 = { version = "0.4", path = "../pem-rfc7468" }
zeroize = { version = "1", default-features = false }

# optional dependencies
sec1 = { version = "=0.3.0-pre.1", optional = true, default-features = false, path = "../sec1" }
sec1 = { version = "=0.3.0-pre.1", optional = true, default-features = false, features = ["point"], path = "../sec1" }
sha2 = { version = "0.10", optional = true, default-features = false }
subtle = { version = "2", optional = true, default-features = false }

Expand Down