Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some deprecated patterns when using BoringSSL #1945

Merged
merged 1 commit into from Jun 4, 2023
Merged

Fix some deprecated patterns when using BoringSSL #1945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion openssl/src/asn1.rs
View file
Open in desktop
Expand Up @@ -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)]
Expand Down
5 changes: 3 additions & 2 deletions openssl/src/dsa.rs
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -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)]
Expand Down Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion openssl/src/ecdsa.rs
View file
Open in desktop
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion openssl/src/hash.rs
View file
Open in desktop
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion openssl/src/md_ctx.rs
View file
Open in desktop
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion openssl/src/rsa.rs
View file
Open in desktop
Expand Up @@ -581,7 +581,7 @@ impl<T> fmt::Debug for Rsa<T> {
}

cfg_if! {
if #[cfg(any(ossl110, libressl273))] {
if #[cfg(any(ossl110, libressl273, boringssl))] {
use ffi::{
RSA_get0_key, RSA_get0_factors, RSA_get0_crt_params, RSA_set0_key, RSA_set0_factors,
RSA_set0_crt_params,
Expand Down