Commit 618b68f9 authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge pull request #262 from jedisct1/read_dhparams 

Add DH::from_pem() to load DH parameters from a file
parents f4bf55fa 6666a181

openssl-sys/src/lib.rs

+2 −1
Original line number Diff line number Diff line
@@ -477,7 +477,8 @@ extern "C" { 
    #[cfg_attr(target_os = "nacl", link_name = "HMAC_Update")]

    pub fn HMAC_Update_shim(ctx: *mut HMAC_CTX, input: *const u8, len: c_uint) -> c_int;





    pub fn PEM_read_bio_DHparams(bio: *mut BIO, out: *mut *mut DH, callback: Option<PasswordCallback>,

                             user_data: *mut c_void) -> *mut DH;

    pub fn PEM_read_bio_X509(bio: *mut BIO, out: *mut *mut X509, callback: Option<PasswordCallback>,

                             user_data: *mut c_void) -> *mut X509;

    pub fn PEM_read_bio_X509_REQ(bio: *mut BIO, out: *mut *mut X509_REQ, callback: Option<PasswordCallback>,

openssl/src/dh/mod.rs

+27 −1
Original line number Diff line number Diff line 
use ffi;

use ssl::error::SslError;

use std::io;

use std::io::prelude::*;

use ssl::error::{SslError, StreamError};

use bio::MemBio;

use bn::BigNum;

use std::mem;

use std::ptr;
@@ -18,6 +21,16 @@ impl DH { 
        Ok(DH(dh))

    }



    pub fn from_pem<R>(reader: &mut R) -> Result<DH, SslError> where R: Read {

        let mut mem_bio = try!(MemBio::new());

        try!(io::copy(reader, &mut mem_bio).map_err(StreamError));

        let dh = unsafe {

            ffi::PEM_read_bio_DHparams(mem_bio.get_handle(), ptr::null_mut(), None, ptr::null_mut())

        };

        try_ssl_null!(dh);

        Ok(DH(dh))

    }



    #[cfg(feature = "rfc5114")]

    pub fn get_1024_160() -> Result<DH, SslError> {

        let dh = unsafe { ffi::DH_get_1024_160() };
@@ -68,6 +81,8 @@ impl Drop for DH { 


#[cfg(test)]

mod tests {

    use std::fs::File;

    use std::path::Path;

    use super::DH;

    use bn::BigNum;

    use ssl::SslContext;
@@ -94,4 +109,15 @@ mod tests { 
        let dh = DH::from_params(p, g, q).unwrap();

        ctx.set_tmp_dh(dh).unwrap();

    }



    #[test]

    fn test_dh_from_pem() {

        let ctx = SslContext::new(Sslv23).unwrap();

        let pem_path = Path::new("test/dhparams.pem");

        let mut file = File::open(&pem_path)

            .ok()

            .expect("Failed to open `test/dhparams.pem`");

        let dh = DH::from_pem(&mut file).ok().expect("Failed to load PEM");

        ctx.set_tmp_dh(dh).unwrap();

    }

}

openssl/test/dhparams.pem

0 → 100644
+8 −0
Original line number Diff line number Diff line 
-----BEGIN DH PARAMETERS-----

MIIBCAKCAQEAh3Betv+hf5jNsOmGXU8oxuABD2B8r0yU8FVgjnCZBSVo61qJ0A2d

J6r8rYKbjtolnrZN/V4IPSzYvxurHbu8nbiFVyhOySPchI2Fu+YT/HsSe/0MH9bW

gJTNzmutWoy9VxtWLCmXnOSZHep3MZ1ZNimno6Kh2qQ7VJr0+KF8GbxUKOPv4SqK

NBwouIQXFc0pE9kGhcGKbr7TnHhyJFCRLNP1OVDQZbcoKjk1Vh+5sy7vM2VUTQmM

yOToT2LEZVAUJXNumcYMki9MIwfYCwYZbNt0ZEolyHzUEesuyHfU1eJd6+sKEjUz

5GteQIR7AehxZIS+cytu7BXO7B0owLJ2awIBAg==

-----END DH PARAMETERS-----