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

Merge pull request #1945 from davidben/opaque-rsa-dsa 

Fix some deprecated patterns when using BoringSSL
parents e641bd23 5283d7c9

openssl/src/asn1.rs

+1 −1
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ impl fmt::Debug for Asn1ObjectRef { 
}



cfg_if! {

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

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

        use ffi::ASN1_STRING_get0_data;

    } else {

        #[allow(bad_style)]

openssl/src/dsa.rs

+3 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


use cfg_if::cfg_if;

use foreign_types::{ForeignType, ForeignTypeRef};

#[cfg(not(boringssl))]

use libc::c_int;

use std::fmt;

use std::mem;
@@ -314,7 +315,7 @@ impl<T> fmt::Debug for Dsa<T> { 
}



cfg_if! {

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

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

        use ffi::{DSA_get0_key, DSA_get0_pqg, DSA_set0_key, DSA_set0_pqg};

    } else {

        #[allow(bad_style)]
@@ -493,7 +494,7 @@ impl DsaSigRef { 
}



cfg_if! {

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

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

        use ffi::{DSA_SIG_set0, DSA_SIG_get0};

    } else {

        #[allow(bad_style)]

openssl/src/ecdsa.rs

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ impl EcdsaSigRef { 
}



cfg_if! {

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

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

        use ffi::{ECDSA_SIG_set0, ECDSA_SIG_get0};

    } else {

        #[allow(bad_style)]

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(ossl110)] {

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

        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(ossl110)] {

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

        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};