Unverified Commit c4e787ad authored by Alex Gaynor's avatar Alex Gaynor Committed by GitHub
Browse files

Merge pull request #1980 from alex/rsa-set-pss-salt-len 

Added set_rsa_pss_saltlen to PkeyCtx
parents aee88abb c10bbd09

openssl/src/pkey_ctx.rs

+42 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ use crate::error::ErrorStack; 
use crate::md::MdRef;

use crate::pkey::{HasPrivate, HasPublic, Id, PKey, PKeyRef, Private};

use crate::rsa::Padding;

use crate::sign::RsaPssSaltlen;

use crate::{cvt, cvt_n, cvt_p};

use foreign_types::{ForeignType, ForeignTypeRef};

#[cfg(not(boringssl))]
@@ -397,6 +398,21 @@ impl<T> PkeyCtxRef<T> { 
        Ok(())

    }



    /// Sets the RSA PSS salt length.

    ///

    /// This is only useful for RSA keys.

    #[corresponds(EVP_PKEY_CTX_set_rsa_pss_saltlen)]

    #[inline]

    pub fn set_rsa_pss_saltlen(&mut self, len: RsaPssSaltlen) -> Result<(), ErrorStack> {

        unsafe {

            cvt(ffi::EVP_PKEY_CTX_set_rsa_pss_saltlen(

                self.as_ptr(),

                len.as_raw(),

            ))

            .map(|_| ())

        }

    }



    /// Sets the RSA MGF1 algorithm.

    ///

    /// This is only useful for RSA keys.
@@ -736,6 +752,32 @@ mod test { 
        assert!(matches!(verifier.verify(&signature), Ok(true)));

    }



    #[test]

    fn rsa_sign_pss() {

        let key = include_bytes!("../test/rsa.pem");

        let rsa = Rsa::private_key_from_pem(key).unwrap();

        let pkey = PKey::from_rsa(rsa).unwrap();



        let mut ctx = PkeyCtx::new(&pkey).unwrap();

        ctx.sign_init().unwrap();

        ctx.set_rsa_padding(Padding::PKCS1_PSS).unwrap();

        ctx.set_signature_md(Md::sha384()).unwrap();

        ctx.set_rsa_pss_saltlen(RsaPssSaltlen::custom(14)).unwrap();



        let msg = b"hello world";

        let digest = hash(MessageDigest::sha384(), msg).unwrap();

        let mut signature = vec![];

        ctx.sign_to_vec(&digest, &mut signature).unwrap();



        let mut verifier = Verifier::new(MessageDigest::sha384(), &pkey).unwrap();

        verifier.set_rsa_padding(Padding::PKCS1_PSS).unwrap();

        verifier

            .set_rsa_pss_saltlen(RsaPssSaltlen::custom(14))

            .unwrap();

        verifier.update(msg).unwrap();

        assert!(matches!(verifier.verify(&signature), Ok(true)));

    }



    #[test]

    fn derive() {

        let group = EcGroup::from_curve_name(Nid::X9_62_PRIME256V1).unwrap();

openssl/src/sign.rs

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ pub struct RsaPssSaltlen(c_int); 


impl RsaPssSaltlen {

    /// Returns the integer representation of `RsaPssSaltlen`.

    fn as_raw(&self) -> c_int {

    pub(crate) fn as_raw(&self) -> c_int {

        self.0

    }