Unverified Commit 2b29f448 authored by Steven Fackler's avatar Steven Fackler
Browse files

fixes

parent b7ed1ee8

openssl-sys/src/bio.rs

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ extern "C" { 


#[allow(clashing_extern_declarations)]

extern "C" {

    // FIXME should wrap in Option

    #[cfg(any(ossl110, libressl273))]

    #[link_name = "BIO_meth_set_write"]

    pub fn BIO_meth_set_write__fixed_rust(

openssl-sys/src/ec.rs

+10 −0
Original line number Diff line number Diff line
@@ -4,3 +4,13 @@ use std::ptr; 
use *;



pub const OPENSSL_EC_NAMED_CURVE: c_int = 1;



#[cfg(ossl300)]

pub unsafe fn EVP_EC_gen(curve: *const c_char) -> *mut EVP_PKEY {

    EVP_PKEY_Q_keygen(

        ptr::null_mut(),

        ptr::null_mut(),

        "EC\0".as_ptr().cast(),

        curve,

    )

}

openssl-sys/src/handwritten/ec.rs

+0 −10
Original line number Diff line number Diff line
@@ -238,13 +238,3 @@ extern "C" { 


    pub fn i2d_ECDSA_SIG(sig: *const ECDSA_SIG, out: *mut *mut c_uchar) -> c_int;

}
 


#[cfg(ossl300)]

pub unsafe fn EVP_EC_gen(curve: *const c_char) -> *mut EVP_PKEY {

    EVP_PKEY_Q_keygen(

        ptr::null_mut(),

        ptr::null_mut(),

        "EC\0".as_ptr().cast(),

        curve,

    )

}

openssl-sys/src/types.rs

+3 −0
Original line number Diff line number Diff line 
use libc::*;

use *;



cfg_if! {

    if #[cfg(any(ossl110, libressl280))] {

        pub enum EVP_PKEY {}