Unverified Commit a79c590f authored by Alex Gaynor's avatar Alex Gaynor Committed by GitHub
Browse files

Merge pull request #2067 from botovq/evp_md_ctx_new 

Use EVP_MD_CTX_{new,free}() in LibreSSL 3.8.2
parents 04ffe960 ae74dec4

openssl-sys/src/handwritten/evp.rs

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ cfg_if! { 
}



cfg_if! {

    if #[cfg(ossl110)] {

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

        extern "C" {

            pub fn EVP_MD_CTX_new() -> *mut EVP_MD_CTX;

            pub fn EVP_MD_CTX_free(ctx: *mut EVP_MD_CTX);

openssl/src/hash.rs

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ use crate::nid::Nid; 
use crate::{cvt, cvt_p};



cfg_if! {

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

    if #[cfg(any(ossl110, boringssl, libressl382))] {

        use ffi::{EVP_MD_CTX_free, EVP_MD_CTX_new};

    } else {

        use ffi::{EVP_MD_CTX_create as EVP_MD_CTX_new, EVP_MD_CTX_destroy as EVP_MD_CTX_free};

openssl/src/md_ctx.rs

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ use std::convert::TryFrom; 
use std::ptr;



cfg_if! {

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

    if #[cfg(any(ossl110, boringssl, libressl382))] {

        use ffi::{EVP_MD_CTX_free, EVP_MD_CTX_new};

    } else {

        use ffi::{EVP_MD_CTX_create as EVP_MD_CTX_new, EVP_MD_CTX_destroy as EVP_MD_CTX_free};

openssl/src/sign.rs

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ use crate::rsa::Padding; 
use crate::{cvt, cvt_p};



cfg_if! {

    if #[cfg(ossl110)] {

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

        use ffi::{EVP_MD_CTX_free, EVP_MD_CTX_new};

    } else {

        use ffi::{EVP_MD_CTX_create as EVP_MD_CTX_new, EVP_MD_CTX_destroy as EVP_MD_CTX_free};