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

Merge pull request #819 from sfackler/fips 

FIPS mode support
parents 753a7d07 45c15a65

openssl-sys/src/lib.rs

+5 −0
Original line number Diff line number Diff line
@@ -2694,4 +2694,9 @@ extern "C" { 
    pub fn SMIME_read_CMS(bio: *mut BIO, bcont: *mut *mut BIO) -> *mut CMS_ContentInfo;

    #[cfg(not(libressl))]

    pub fn CMS_ContentInfo_free(cms: *mut CMS_ContentInfo);



    #[cfg(not(libressl))]

    pub fn FIPS_mode_set(onoff: c_int) -> c_int;

    #[cfg(not(libressl))]

    pub fn FIPS_mode() -> c_int;

}

openssl/src/fips.rs

0 → 100644
+22 −0
Original line number Diff line number Diff line 
//! FIPS 140-2 support.

//!

//! See [OpenSSL's documentation] for details.

//!

//! [OpenSSL's documentation]: https://www.openssl.org/docs/fips/UserGuide-2.0.pdf

use cvt;

use error::ErrorStack;

use ffi;



/// Moves the library into or out of the FIPS 140-2 mode of operation.

///

/// This corresponds to `FIPS_mode_set`.

pub fn enable(enabled: bool) -> Result<(), ErrorStack> {

    unsafe { cvt(ffi::FIPS_mode_set(enabled as _)).map(|_| ()) }

}



/// Determines if the library is running in the FIPS 140-2 mode of operation.

///

/// This corresponds to `FIPS_mode`.

pub fn enabled() -> bool {

    unsafe { ffi::FIPS_mode() != 0 }

}

openssl/src/lib.rs

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ pub mod dsa; 
pub mod ec;

pub mod error;

pub mod ex_data;

#[cfg(not(libressl))]

pub mod fips;

pub mod hash;

pub mod memcmp;

pub mod nid;