Unverified Commit cf8c0585 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #2079 from alex/fix-cfg 

Fixed cfg for RSA_PSS
parents bbfe01b4 946b706d

openssl-sys/src/evp.rs

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ pub const PKCS5_SALT_LEN: c_int = 8; 
pub const PKCS12_DEFAULT_ITER: c_int = 2048;



pub const EVP_PKEY_RSA: c_int = NID_rsaEncryption;

#[cfg(any(openssl111, boringssl))]

#[cfg(any(ossl111, libressl310, boringssl))]

pub const EVP_PKEY_RSA_PSS: c_int = NID_rsassaPss;

pub const EVP_PKEY_DSA: c_int = NID_dsa;

pub const EVP_PKEY_DH: c_int = NID_dhKeyAgreement;

openssl/src/pkey.rs

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


impl Id {

    pub const RSA: Id = Id(ffi::EVP_PKEY_RSA);

    #[cfg(any(openssl111, boringssl))]

    #[cfg(any(ossl111, libressl310, boringssl))]

    pub const RSA_PSS: Id = Id(ffi::EVP_PKEY_RSA_PSS);

    #[cfg(not(boringssl))]

    pub const HMAC: Id = Id(ffi::EVP_PKEY_HMAC);