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

Move BIO macros into -sys

parent dd16f64f

openssl-sys/src/lib.rs

+20 −0
Original line number Diff line number Diff line
@@ -274,6 +274,12 @@ pub const BIO_CTRL_INFO: c_int = 3; 
pub const BIO_CTRL_FLUSH: c_int = 11;

pub const BIO_C_SET_BUF_MEM_EOF_RETURN: c_int = 130;



pub const BIO_FLAGS_READ: c_int = 0x01;

pub const BIO_FLAGS_WRITE: c_int = 0x02;

pub const BIO_FLAGS_IO_SPECIAL: c_int = 0x04;

pub const BIO_FLAGS_RWS: c_int = BIO_FLAGS_READ | BIO_FLAGS_WRITE | BIO_FLAGS_IO_SPECIAL;

pub const BIO_FLAGS_SHOULD_RETRY: c_int = 0x08;



pub const CRYPTO_LOCK: c_int = 1;



pub const MBSTRING_ASC:  c_int = MBSTRING_FLAG | 1;
@@ -497,6 +503,18 @@ pub unsafe fn BIO_get_mem_data(b: *mut BIO, pp: *mut *mut c_char) -> c_long { 
    BIO_ctrl(b, BIO_CTRL_INFO, 0, pp as *mut c_void)

}



pub unsafe fn BIO_clear_retry_flags(b: *mut BIO) {

    BIO_clear_flags(b, BIO_FLAGS_RWS | BIO_FLAGS_SHOULD_RETRY)

}



pub unsafe fn BIO_set_retry_read(b: *mut BIO) {

    BIO_set_flags(b, BIO_FLAGS_READ | BIO_FLAGS_SHOULD_RETRY)

}



pub unsafe fn BIO_set_retry_write(b: *mut BIO) {

    BIO_set_flags(b, BIO_FLAGS_WRITE | BIO_FLAGS_SHOULD_RETRY)

}



pub unsafe fn SSL_CTX_set_mode(ctx: *mut SSL_CTX, op: c_long) -> c_long {

    SSL_CTX_ctrl(ctx, SSL_CTRL_MODE, op, ptr::null_mut())

}
@@ -527,6 +545,8 @@ extern "C" { 
    pub fn BIO_write(b: *mut BIO, buf: *const c_void, len: c_int) -> c_int;

    pub fn BIO_s_mem() -> *const BIO_METHOD;

    pub fn BIO_new_mem_buf(buf: *const c_void, len: c_int) -> *mut BIO;

    pub fn BIO_set_flags(b: *mut BIO, flags: c_int);

    pub fn BIO_clear_flags(b: *mut BIO, flags: c_int);



    pub fn BN_new() -> *mut BIGNUM;

    pub fn BN_dup(n: *mut BIGNUM) -> *mut BIGNUM;

openssl/src/ssl/bio.rs

+2 −2
Original line number Diff line number Diff line 
use libc::{c_char, c_int, c_long, c_void, strlen};

use ffi::{self, BIO, BIO_CTRL_FLUSH, BIO_TYPE_NONE, BIO_new};

use ffi_extras::{BIO_clear_retry_flags, BIO_set_retry_read, BIO_set_retry_write};

use ffi::{self, BIO, BIO_CTRL_FLUSH, BIO_TYPE_NONE, BIO_new, BIO_clear_retry_flags,

          BIO_set_retry_read, BIO_set_retry_write};

use std::any::Any;

use std::io;

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