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

Merge pull request #118 from vhbit/oibit-fix 

Update to nightly: explicit Copy trait
parents ae9e2b1e c9220900

openssl-sys/src/lib.rs

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ pub type X509_NAME_ENTRY = c_void; 
pub type X509_REQ = c_void;

pub type X509_STORE_CTX = c_void;



#[allow(missing_copy_implementations)]

#[repr(C)]

pub struct EVP_MD_CTX {

    digest: *mut EVP_MD,
@@ -49,6 +50,7 @@ pub struct EVP_MD_CTX { 
    update: *mut c_void

}



#[allow(missing_copy_implementations)]

#[repr(C)]

pub struct HMAC_CTX {

    md: *mut EVP_MD,
@@ -59,6 +61,7 @@ pub struct HMAC_CTX { 
    key: [c_uchar, ..128]

}



#[allow(missing_copy_implementations)]

#[repr(C)]

pub struct X509V3_CTX {

    flags: c_int,
@@ -72,6 +75,7 @@ pub struct X509V3_CTX { 
    // Maybe more here

}



#[allow(missing_copy_implementations)]

#[repr(C)]

pub struct BIGNUM {

    pub d: *mut c_void,

src/bn/mod.rs

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use ssl::error::SslError; 


pub struct BigNum(*mut ffi::BIGNUM);



#[deriving(Copy)]

#[repr(C)]

pub enum RNGProperty {

    MsbMaybeZero = -1,

src/crypto/hash.rs

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ use std::io; 


use ffi;



#[deriving(Copy)]

pub enum HashType {

    MD5,

    SHA1,

src/crypto/pkey.rs

+3 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ use crypto::hash::HashType; 
use ffi;

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





#[deriving(Copy)]

enum Parts {

    Neither,

    Public,
@@ -14,6 +14,7 @@ enum Parts { 
}



/// Represents a role an asymmetric key might be appropriate for.

#[deriving(Copy)]

pub enum Role {

    Encrypt,

    Decrypt,
@@ -22,6 +23,7 @@ pub enum Role { 
}



/// Type of encryption padding to use.

#[deriving(Copy)]

pub enum EncryptionPadding {

    OAEP,

    PKCS1v15

src/crypto/symm.rs

+2 −0
Original line number Diff line number Diff line
@@ -2,12 +2,14 @@ use libc::{c_int}; 


use ffi;



#[deriving(Copy)]

pub enum Mode {

    Encrypt,

    Decrypt,

}



#[allow(non_camel_case_types)]

#[deriving(Copy)]

pub enum Type {

    AES_128_ECB,

    AES_128_CBC,