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

Merge remote-tracking branch 'origin/breaks'

parents 233f69ff 08e27f31

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ addons: 
    - gcc-arm-linux-gnueabihf

rust:

- nightly

- 1.8.0

- 1.9.0

os:

- osx

- linux

appveyor.yml

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ environment: 
install:

  - ps: Start-FileDownload "http://slproweb.com/download/Win${env:BITS}OpenSSL-1_0_2h.exe"

  - Win%BITS%OpenSSL-1_0_2h.exe /SILENT /VERYSILENT /SP- /DIR="C:\OpenSSL"

  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-1.8.0-${env:TARGET}.exe"

  - rust-1.8.0-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"

  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-1.9.0-${env:TARGET}.exe"

  - rust-1.9.0-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"

  - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin

  - SET PATH=%PATH%;C:\MinGW\bin

  - rustc -V

openssl-sys/src/lib.rs

+8 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ pub type PasswordCallback = extern "C" fn(buf: *mut c_char, size: c_int, 
pub const BIO_TYPE_NONE: c_int = 0;



pub const BIO_CTRL_EOF: c_int = 2;

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;
@@ -453,6 +454,11 @@ fn set_id_callback() { 
#[cfg(not(unix))]

fn set_id_callback() {}



// macros

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)

}



// True functions

extern "C" {

    pub fn ASN1_INTEGER_set(dest: *mut ASN1_INTEGER, value: c_long) -> c_int;
@@ -466,6 +472,7 @@ extern "C" { 
    pub fn BIO_read(b: *mut BIO, buf: *mut c_void, len: c_int) -> c_int;

    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 BN_new() -> *mut BIGNUM;

    pub fn BN_dup(n: *mut BIGNUM) -> *mut BIGNUM;
@@ -741,6 +748,7 @@ extern "C" { 
    pub fn SSL_get_wbio(ssl: *mut SSL) -> *mut BIO;

    pub fn SSL_accept(ssl: *mut SSL) -> c_int;

    pub fn SSL_connect(ssl: *mut SSL) -> c_int;

    pub fn SSL_do_handshake(ssl: *mut SSL) -> c_int;

    pub fn SSL_ctrl(ssl: *mut SSL, cmd: c_int, larg: c_long,

                    parg: *mut c_void) -> c_long;

    pub fn SSL_get_error(ssl: *mut SSL, ret: c_int) -> c_int;

openssl/Cargo.toml

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ rfc5114 = ["openssl-sys/rfc5114"] 
ecdh_auto = ["openssl-sys-extras/ecdh_auto"]

pkcs5_pbkdf2_hmac = ["openssl-sys/pkcs5_pbkdf2_hmac"]



nightly = []

catch_unwind = []



[dependencies]

bitflags = ">= 0.5.0, < 0.8.0"

lazy_static = "0.2"

openssl/src/asn1/mod.rs

+3 −4
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ use libc::c_long; 
use std::ptr;



use ffi;

use ssl::error::SslError;



use error::ErrorStack;



pub struct Asn1Time {

    handle: *mut ffi::ASN1_TIME,
@@ -19,7 +18,7 @@ impl Asn1Time { 
        }

    }



    fn new_with_period(period: u64) -> Result<Asn1Time, SslError> {

    fn new_with_period(period: u64) -> Result<Asn1Time, ErrorStack> {

        ffi::init();



        let handle = unsafe {
@@ -29,7 +28,7 @@ impl Asn1Time { 
    }



    /// Creates a new time on specified interval in days from now

    pub fn days_from_now(days: u32) -> Result<Asn1Time, SslError> {

    pub fn days_from_now(days: u32) -> Result<Asn1Time, ErrorStack> {

        Asn1Time::new_with_period(days as u64 * 60 * 60 * 24)

    }