Skip to content
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.

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

Rename serde1 feature to serde #41

Merged
merged 1 commit into from
Feb 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ subtle = "2.0.0"
version = "1.1.0"
features = ["alloc", "zeroize_derive"]

[dependencies.serde]
[dependencies.serde_crate]
package = "serde"
optional = true
version = "1.0.89"
default-features = false
Expand All @@ -53,5 +54,6 @@ name = "key"
[features]
default = []
nightly = ["subtle/nightly", "num-bigint/nightly"]
serde1 = ["num-bigint/serde", "serde"]
serde = ["num-bigint/serde", "serde_crate"]
serde1 = ["serde"] # deprecated
expose-internals = []
10 changes: 5 additions & 5 deletions src/key.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use num_bigint::Sign::Plus;
use num_bigint::{BigInt, BigUint};
use num_traits::{FromPrimitive, One};
use rand::{rngs::ThreadRng, Rng};
#[cfg(feature = "serde1")]
use serde::{Deserialize, Serialize};
#[cfg(feature = "serde")]
use serde_crate::{Deserialize, Serialize};
use zeroize::Zeroize;

use crate::algorithms::generate_multi_prime_key;
Expand All @@ -20,15 +20,15 @@ lazy_static! {

/// Represents the public part of an RSA key.
#[derive(Debug, Clone, PartialEq, Eq)]
#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
pub struct RSAPublicKey {
n: BigUint,
e: BigUint,
}

/// Represents a whole RSA key, public and private parts.
#[derive(Debug, Clone)]
#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate="serde_crate"))]
pub struct RSAPrivateKey {
/// Modulus
n: BigUint,
Expand All @@ -39,7 +39,7 @@ pub struct RSAPrivateKey {
/// Prime factors of N, contains >= 2 elements.
primes: Vec<BigUint>,
/// precomputed values to speed up private operations
#[cfg_attr(feature = "serde1", serde(skip))]
#[cfg_attr(feature = "serde", serde(skip))]
pub(crate) precomputed: Option<PrecomputedValues>,
}

Expand Down
6 changes: 3 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ extern crate rand;
extern crate subtle;
extern crate zeroize;

#[cfg(feature = "serde1")]
extern crate serde;
#[cfg(feature = "serde")]
extern crate serde_crate;

#[cfg(test)]
extern crate base64;
#[cfg(test)]
extern crate hex;
#[cfg(all(test, feature = "serde1"))]
#[cfg(all(test, feature = "serde"))]
extern crate serde_test;

pub use num_bigint::BigUint;
Expand Down