min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switches to new type wrapper for RsaPssSaltlen

This commit is contained in:
Bastian Köcher 2018-03-10 00:26:20 +01:00
parent a5ba1a0007
commit 7fe3fabf24
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openssl/src/pkey.rs
View File

@ -178,8 +178,7 @@ impl<T> PKeyRef<T> {
} }
} }
/// Returns `Some(Oid)` as the type of this key or `None`, if the Oid is supported by this /// Returns the Oid that represents the type of this key.
/// library.
/// ///
/// This corresponds to [`EVP_PKEY_id`]. /// This corresponds to [`EVP_PKEY_id`].
/// ///

35
openssl/src/sign.rs
View File

@ -80,26 +80,25 @@ use ffi::{EVP_MD_CTX_free, EVP_MD_CTX_new};
use ffi::{EVP_MD_CTX_create as EVP_MD_CTX_new, EVP_MD_CTX_destroy as EVP_MD_CTX_free}; use ffi::{EVP_MD_CTX_create as EVP_MD_CTX_new, EVP_MD_CTX_destroy as EVP_MD_CTX_free};
/// Salt lengths that must be used with `set_rsa_pss_saltlen`. /// Salt lengths that must be used with `set_rsa_pss_saltlen`.
pub enum RsaPssSaltlen { pub struct RsaPssSaltlen(c_int);
/// The salt length is set to the digest length.
/// Corresponds to the special value `-1`.
DigestLength,
/// The salt length is set to the maximum permissible value.
/// Corresponds to the special value `-2`.
MaximumLength,
/// Sets the salt length to the given value.
Custom(u32)
}
impl RsaPssSaltlen { impl RsaPssSaltlen {
/// Returns the integer representation of `Oid`. /// Returns the integer representation of `RsaPssSaltlen`.
fn as_raw(&self) -> c_int { fn as_raw(&self) -> c_int {
match *self { self.0
RsaPssSaltlen::DigestLength => -1,
RsaPssSaltlen::MaximumLength => -2,
RsaPssSaltlen::Custom(val) => val as c_int,
}
} }
/// Sets the salt length to the given value.
pub fn custom(val: c_int) -> RsaPssSaltlen {
RsaPssSaltlen(val)
}
/// The salt length is set to the digest length.
/// Corresponds to the special value `-1`.
pub const DIGEST_LENGTH: RsaPssSaltlen = RsaPssSaltlen(-1);
/// The salt length is set to the maximum permissible value.
/// Corresponds to the special value `-2`.
pub const MAXIMUM_LENGTH: RsaPssSaltlen = RsaPssSaltlen(-2);
} }
/// A type which computes cryptographic signatures of data. /// A type which computes cryptographic signatures of data.
@ -657,14 +656,14 @@ mod test {
let mut signer = Signer::new(MessageDigest::sha256(), &pkey).unwrap(); let mut signer = Signer::new(MessageDigest::sha256(), &pkey).unwrap();
signer.set_rsa_padding(Padding::PKCS1_PSS).unwrap(); signer.set_rsa_padding(Padding::PKCS1_PSS).unwrap();
assert_eq!(signer.rsa_padding().unwrap(), Padding::PKCS1_PSS); assert_eq!(signer.rsa_padding().unwrap(), Padding::PKCS1_PSS);
signer.set_rsa_pss_saltlen(RsaPssSaltlen::DigestLength).unwrap(); signer.set_rsa_pss_saltlen(RsaPssSaltlen::DIGEST_LENGTH).unwrap();
signer.set_rsa_mgf1_md(MessageDigest::sha256()).unwrap(); signer.set_rsa_mgf1_md(MessageDigest::sha256()).unwrap();
signer.update(&Vec::from_hex(INPUT).unwrap()).unwrap(); signer.update(&Vec::from_hex(INPUT).unwrap()).unwrap();
let signature = signer.sign_to_vec().unwrap(); let signature = signer.sign_to_vec().unwrap();
let mut verifier = Verifier::new(MessageDigest::sha256(), &pkey).unwrap(); let mut verifier = Verifier::new(MessageDigest::sha256(), &pkey).unwrap();
verifier.set_rsa_padding(Padding::PKCS1_PSS).unwrap(); verifier.set_rsa_padding(Padding::PKCS1_PSS).unwrap();
verifier.set_rsa_pss_saltlen(RsaPssSaltlen::DigestLength).unwrap(); verifier.set_rsa_pss_saltlen(RsaPssSaltlen::DIGEST_LENGTH).unwrap();
verifier.set_rsa_mgf1_md(MessageDigest::sha256()).unwrap(); verifier.set_rsa_mgf1_md(MessageDigest::sha256()).unwrap();
verifier.update(&Vec::from_hex(INPUT).unwrap()).unwrap(); verifier.update(&Vec::from_hex(INPUT).unwrap()).unwrap();
assert!(verifier.verify(&signature).unwrap()); assert!(verifier.verify(&signature).unwrap());