Skip to content

sm2: pke no std support #1325

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+467 −322
Open

sm2: pke no std support #1325

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1b88cd
sm2: pke no std support
MaxKingPor Jul 22, 2025
376c394
Merge branch 'RustCrypto:master' into master
MaxKingPor Jul 23, 2025
9220a47
Restore the default std feature
MaxKingPor Jul 23, 2025
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
4 changes: 2 additions & 2 deletions sm2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ proptest = "1"
rand_core = { version = "0.9", features = ["os_rng"] }

[features]
default = ["arithmetic", "dsa", "pke", "pem", "std"]
default = ["arithmetic", "dsa", "pke", "pem"]
alloc = ["elliptic-curve/alloc"]
std = ["alloc", "elliptic-curve/std"]

getrandom = ["rand_core/os_rng"]
arithmetic = ["dep:primefield", "dep:primeorder", "elliptic-curve/arithmetic"]
bits = ["arithmetic", "elliptic-curve/bits"]
dsa = ["arithmetic", "dep:rfc6979", "dep:signature", "dep:sm3"]
Expand Down
7 changes: 3 additions & 4 deletions sm2/src/dsa.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,11 @@ use signature::{Error, Result, SignatureEncoding};
#[cfg(feature = "alloc")]
use alloc::vec::Vec;

#[cfg(feature = "pkcs8")]
#[cfg(all(feature = "alloc", feature = "pkcs8"))]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you changing this? Everything but SignatureBitStringEncoding is available in no-alloc environments

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you resolve this comment without answering or changing anything?

use crate::pkcs8::{
AlgorithmIdentifierRef, ObjectIdentifier, der::AnyRef, spki::AssociatedAlgorithmIdentifier,
AlgorithmIdentifierRef, ObjectIdentifier, der, der::AnyRef,
spki::AssociatedAlgorithmIdentifier, spki::SignatureBitStringEncoding,
};
#[cfg(all(feature = "alloc", feature = "pkcs8"))]
use crate::pkcs8::{der, spki::SignatureBitStringEncoding};

/// SM2DSA signature serialized as bytes.
pub type SignatureBytes = [u8; Signature::BYTE_SIZE];
Expand Down
4 changes: 2 additions & 2 deletions sm2/src/dsa/signing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ use signature::{
};
use sm3::Sm3;

#[cfg(feature = "pkcs8")]
#[cfg(all(feature = "pkcs8", feature = "alloc"))]
use crate::pkcs8::{
der::AnyRef,
spki::{AlgorithmIdentifier, AssociatedAlgorithmIdentifier, SignatureAlgorithmIdentifier},
Expand Down Expand Up @@ -247,7 +247,7 @@ fn sign_prehash_rfc6979(secret_scalar: &Scalar, prehash: &[u8], data: &[u8]) ->
Signature::from_scalars(r, s)
}

#[cfg(feature = "pkcs8")]
#[cfg(all(feature = "pkcs8", feature = "alloc"))]
impl SignatureAlgorithmIdentifier for SigningKey {
type Params = AnyRef<'static>;

Expand Down
6 changes: 3 additions & 3 deletions sm2/src/dsa/verifying.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ use sm3::{Sm3, digest::Digest};
use alloc::{boxed::Box, string::String};

#[cfg(all(feature = "alloc", feature = "pkcs8"))]
use crate::pkcs8::{self, EncodePublicKey, spki};
#[cfg(feature = "pkcs8")]
use crate::pkcs8::{
self, EncodePublicKey,
der::AnyRef,
spki,
spki::{AlgorithmIdentifier, AssociatedAlgorithmIdentifier, SignatureAlgorithmIdentifier},
};

Expand Down Expand Up @@ -223,7 +223,7 @@ impl EncodePublicKey for VerifyingKey {
}
}

#[cfg(feature = "pkcs8")]
#[cfg(all(feature = "pkcs8", feature = "alloc"))]
impl SignatureAlgorithmIdentifier for VerifyingKey {
type Params = AnyRef<'static>;

Expand Down
Loading