Commit bbae793e authored by Steven Fackler's avatar Steven Fackler
Browse files

Upgrade bitflags to 1.0 

Closes #756
parent 2aaba8bd

openssl/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ v102 = [] 
v110 = []



[dependencies]

bitflags = "0.9"

bitflags = "1.0"

foreign-types = "0.3.1"

lazy_static = "1"

libc = "0.2"

openssl/src/ec.rs

+32 −33
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ 
//!

//! ```

//! use openssl::ec::{EcGroup, EcPoint};

//! use openssl::nid;

//! use openssl::nid::Nid;

//! use openssl::error::ErrorStack;

//! fn get_ec_point() -> Result<EcPoint, ErrorStack> {

//!    let group = EcGroup::from_curve_name(nid::SECP224R1)?;

//!    let group = EcGroup::from_curve_name(Nid::SECP224R1)?;

//!    let point = EcPoint::new(&group)?;

//!    Ok(point)

//! }
@@ -38,7 +38,7 @@ use std::mem; 
use libc::c_int;



use {cvt, cvt_n, cvt_p, init};

use bn::{BigNumRef, BigNumContextRef};

use bn::{BigNumContextRef, BigNumRef};

use error::ErrorStack;

use nid::Nid;
@@ -606,14 +606,14 @@ impl EcKey { 
    /// ```no_run

    /// use openssl::bn::BigNumContext;

    /// use openssl::ec::*;

    /// use openssl::nid;

    /// use openssl::nid::Nid;

    /// use openssl::pkey::PKey;

    ///

    /// // get bytes from somewhere, i.e. this will not produce a valid key

    /// let public_key: Vec<u8> = vec![];

    ///

    /// // create an EcKey from the binary form of a EcPoint

    /// let group = EcGroup::from_curve_name(nid::SECP256K1).unwrap();

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

    /// let mut ctx = BigNumContext::new().unwrap();

    /// let point = EcPoint::from_bytes(&group, &public_key, &mut ctx).unwrap();

    /// let key = EcKey::from_public_key(&group, &point);
@@ -645,7 +645,6 @@ impl EcKey { 
    private_key_from_der!(EcKey, ffi::d2i_ECPrivateKey);

}





foreign_type_and_impl_send_sync! {

    type CType = ffi::EC_KEY;

    fn drop = ffi::EC_KEY_free;
@@ -731,18 +730,18 @@ impl EcKeyBuilderRef { 
#[cfg(test)]

mod test {

    use bn::{BigNum, BigNumContext};

    use nid;

    use nid::Nid;

    use data_encoding::BASE64URL_NOPAD;

    use super::*;



    #[test]

    fn key_new_by_curve_name() {

        EcKey::from_curve_name(nid::X9_62_PRIME256V1).unwrap();

        EcKey::from_curve_name(Nid::X9_62_PRIME256V1).unwrap();

    }



    #[test]

    fn generate() {

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

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

        let key = EcKey::generate(&group).unwrap();

        key.public_key().unwrap();

        key.private_key().unwrap();
@@ -750,20 +749,20 @@ mod test { 


    #[test]

    fn dup() {

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

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

        let key = EcKey::generate(&group).unwrap();

        key.to_owned().unwrap();

    }



    #[test]

    fn point_new() {

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

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

        EcPoint::new(&group).unwrap();

    }



    #[test]

    fn point_bytes() {

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

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

        let key = EcKey::generate(&group).unwrap();

        let point = key.public_key().unwrap();

        let mut ctx = BigNumContext::new().unwrap();
@@ -776,7 +775,7 @@ mod test { 


    #[test]

    fn mul_generator() {

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

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

        let key = EcKey::generate(&group).unwrap();

        let mut ctx = BigNumContext::new().unwrap();

        let mut public_key = EcPoint::new(&group).unwrap();
@@ -792,7 +791,7 @@ mod test { 


    #[test]

    fn key_from_public_key() {

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

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

        let key = EcKey::generate(&group).unwrap();

        let mut ctx = BigNumContext::new().unwrap();

        let bytes = key.public_key()
@@ -810,13 +809,13 @@ mod test { 


    #[test]

    fn key_from_affine_coordinates() {

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

        let x = BASE64URL_NOPAD.decode(

            "MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4".as_bytes(),

        ).unwrap();

        let y = BASE64URL_NOPAD.decode(

            "4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM".as_bytes(),

        ).unwrap();

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

        let x = BASE64URL_NOPAD

            .decode("MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4".as_bytes())

            .unwrap();

        let y = BASE64URL_NOPAD

            .decode("4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM".as_bytes())

            .unwrap();



        let xbn = BigNum::from_slice(&x).unwrap();

        let ybn = BigNum::from_slice(&y).unwrap();
@@ -834,10 +833,10 @@ mod test { 


    #[test]

    fn set_private_key() {

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

        let d = BASE64URL_NOPAD.decode(

            "870MB6gfuTJ4HtUnUvYMyJpr5eUZNP4Bk43bVdj3eAE".as_bytes(),

        ).unwrap();

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

        let d = BASE64URL_NOPAD

            .decode("870MB6gfuTJ4HtUnUvYMyJpr5eUZNP4Bk43bVdj3eAE".as_bytes())

            .unwrap();



        let dbn = BigNum::from_slice(&d).unwrap();
@@ -851,13 +850,13 @@ mod test { 


    #[test]

    fn get_affine_coordinates() {

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

        let x = BASE64URL_NOPAD.decode(

            "MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4".as_bytes(),

        ).unwrap();

        let y = BASE64URL_NOPAD.decode(

            "4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM".as_bytes(),

        ).unwrap();

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

        let x = BASE64URL_NOPAD

            .decode("MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4".as_bytes())

            .unwrap();

        let y = BASE64URL_NOPAD

            .decode("4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM".as_bytes())

            .unwrap();



        let xbn = BigNum::from_slice(&x).unwrap();

        let ybn = BigNum::from_slice(&y).unwrap();

openssl/src/nid.rs

+2 −2
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ use libc::c_int; 
/// To view the integer representation of a `Nid`:

///

/// ```

/// use openssl::nid;

/// use openssl::nid::Nid;

///

/// assert!(nid::AES_256_GCM.as_raw() == 901);

/// assert!(Nid::AES_256_GCM.as_raw() == 901);

/// ```

///

/// # External Documentation

openssl/src/ocsp.rs

+11 −11
Original line number Diff line number Diff line
@@ -14,17 +14,17 @@ use x509::{X509, X509Ref}; 


bitflags! {

    pub struct Flag: c_ulong {

        const FLAG_NO_CERTS = ffi::OCSP_NOCERTS;

        const FLAG_NO_INTERN = ffi::OCSP_NOINTERN;

        const FLAG_NO_CHAIN = ffi::OCSP_NOCHAIN;

        const FLAG_NO_VERIFY = ffi::OCSP_NOVERIFY;

        const FLAG_NO_EXPLICIT = ffi::OCSP_NOEXPLICIT;

        const FLAG_NO_CA_SIGN = ffi::OCSP_NOCASIGN;

        const FLAG_NO_DELEGATED = ffi::OCSP_NODELEGATED;

        const FLAG_NO_CHECKS = ffi::OCSP_NOCHECKS;

        const FLAG_TRUST_OTHER = ffi::OCSP_TRUSTOTHER;

        const FLAG_RESPID_KEY = ffi::OCSP_RESPID_KEY;

        const FLAG_NO_TIME = ffi::OCSP_NOTIME;

        const NO_CERTS = ffi::OCSP_NOCERTS;

        const NO_INTERN = ffi::OCSP_NOINTERN;

        const NO_CHAIN = ffi::OCSP_NOCHAIN;

        const NO_VERIFY = ffi::OCSP_NOVERIFY;

        const NO_EXPLICIT = ffi::OCSP_NOEXPLICIT;

        const NO_CA_SIGN = ffi::OCSP_NOCASIGN;

        const NO_DELEGATED = ffi::OCSP_NODELEGATED;

        const NO_CHECKS = ffi::OCSP_NOCHECKS;

        const TRUST_OTHER = ffi::OCSP_TRUSTOTHER;

        const RESPID_KEY = ffi::OCSP_RESPID_KEY;

        const NO_TIME = ffi::OCSP_NOTIME;

    }

}

openssl/src/pkcs12.rs

+2 −2
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ mod test { 
    use asn1::Asn1Time;

    use rsa::Rsa;

    use pkey::PKey;

    use nid;

    use nid::Nid;

    use x509::{X509, X509Name};

    use x509::extension::KeyUsage;
@@ -238,7 +238,7 @@ mod test { 
        let pkey = PKey::from_rsa(rsa).unwrap();



        let mut name = X509Name::builder().unwrap();

        name.append_entry_by_nid(nid::COMMONNAME, subject_name)

        name.append_entry_by_nid(Nid::COMMONNAME, subject_name)

            .unwrap();

        let name = name.build();