Commit 98b7f2f9 authored by Steven Fackler's avatar Steven Fackler
Browse files

Flatten crypto module

parent 58f6d113

openssl/src/crypto/mod.rs

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
// Copyright 2011 Google Inc.

//           2013 Jack Lloyd

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//     http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.

//



mod util;

pub mod dsa;

pub mod hash;

pub mod memcmp;

pub mod pkcs12;

pub mod pkcs5;

pub mod pkey;

pub mod rand;

pub mod rsa;

pub mod sign;

pub mod symm;

openssl/src/crypto/dsa.rs→openssl/src/dsa.rs

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ use libc::{c_int, c_char, c_void}; 
use {cvt, cvt_p};

use bn::BigNumRef;

use bio::{MemBio, MemBioSlice};

use crypto::util::{CallbackState, invoke_passwd_cb};

use util::{CallbackState, invoke_passwd_cb};



/// Builder for upfront DSA parameter generation

pub struct DSAParams(*mut ffi::DSA);
@@ -248,7 +248,7 @@ mod test { 
    #[test]

    pub fn test_password() {

        let mut password_queried = false;

        let key = include_bytes!("../../test/dsa-encrypted.pem");

        let key = include_bytes!("../test/dsa-encrypted.pem");

        DSA::private_key_from_pem_cb(key, |password| {

            password_queried = true;

            password[0] = b'm' as c_char;

openssl/src/crypto/hash.rs→openssl/src/hash.rs

+0 −0

File moved.

View file

openssl/src/lib.rs

+13 −3
Original line number Diff line number Diff line
@@ -22,17 +22,27 @@ use error::ErrorStack; 


mod macros;



pub mod asn1;

mod bio;

mod opaque;

mod util;

pub mod asn1;

pub mod bn;

pub mod crypto;

pub mod dh;

pub mod dsa;

pub mod error;

pub mod hash;

pub mod memcmp;

pub mod nid;

pub mod pkcs12;

pub mod pkcs5;

pub mod pkey;

pub mod rand;

pub mod rsa;

pub mod sign;

pub mod ssl;

pub mod symm;

pub mod version;

pub mod x509;

mod opaque;



pub fn cvt_p<T>(r: *mut T) -> Result<*mut T, ErrorStack> {

    if r.is_null() {

openssl/src/crypto/memcmp.rs→openssl/src/memcmp.rs

+0 −0

File moved.

View file