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

Copy over getter macros

parent bf07dd9a

openssl-sys/src/lib.rs

+12 −0
Original line number Diff line number Diff line
@@ -600,6 +600,18 @@ pub unsafe fn SSL_set_tlsext_host_name(s: *mut SSL, name: *mut c_char) -> c_long 
    SSL_ctrl(s, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, name as *mut c_void)

}



pub unsafe fn EVP_CIPHER_block_size(e: *const EVP_CIPHER) -> c_int {

    (*e).block_size

}



pub unsafe fn EVP_CIPHER_key_length(e: *const EVP_CIPHER) -> c_int {

    (*e).key_len

}



pub unsafe fn EVP_CIPHER_iv_length(e: *const EVP_CIPHER) -> c_int {

    (*e).iv_len

}



// True functions

extern "C" {

    pub fn ASN1_INTEGER_set(dest: *mut ASN1_INTEGER, value: c_long) -> c_int;

openssl/src/crypto/symm.rs

+3 −3
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ impl Type { 
    /// Returns the length of keys used with this cipher.

    pub fn key_len(&self) -> usize {

        unsafe {

            (*self.as_ptr()).key_len as usize

            ffi::EVP_CIPHER_key_length(self.as_ptr()) as usize

        }

    }
@@ -87,7 +87,7 @@ impl Type { 
    /// cipher does not use an IV.

    pub fn iv_len(&self) -> Option<usize> {

        unsafe {

            let len = (*self.as_ptr()).iv_len as usize;

            let len = ffi::EVP_CIPHER_iv_length(self.as_ptr()) as usize;

            if len == 0 {

                None

            } else {
@@ -103,7 +103,7 @@ impl Type { 
    /// Stream ciphers such as RC4 have a block size of 1.

    pub fn block_size(&self) -> usize {

        unsafe {

            (*self.as_ptr()).block_size as usize

            ffi::EVP_CIPHER_block_size(self.as_ptr()) as usize

        }

    }

}

openssl/src/crypto/pkcs5.rs

+3 −3

File changed.

Contains only whitespace changes.