diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-01-04 19:47:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-04 19:47:37 +0000 |
| commit | f8e69420527309bee4548c3449ac30cd1812b4d1 (patch) | |
| tree | 5cbdc7aded2ed5d90e7c962b899f9acd672fc157 /src/x509/store.rs | |
| parent | 4f1b0842e9aea467d3853d30ff19f99d32b54a70 (diff) | |
| parent | f261b8bfbdb3c94065c20ab66e9e76b6b81b15e4 (diff) | |
| download | openssl-f8e69420527309bee4548c3449ac30cd1812b4d1.tar.gz | |
Merge "Import upstream fixes to type-safety flaws in rust-openssl" into main am: f261b8bfbd
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/openssl/+/2882766
Change-Id: I517f9de783ff4c38638c2c7814361c2ee4bfb40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'src/x509/store.rs')
| -rw-r--r-- | src/x509/store.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/x509/store.rs b/src/x509/store.rs index a685fa1..2219cfc 100644 --- a/src/x509/store.rs +++ b/src/x509/store.rs @@ -49,6 +49,7 @@ use crate::error::ErrorStack; #[cfg(not(boringssl))] use crate::ssl::SslFiletype; use crate::stack::StackRef; +use crate::util::ForeignTypeRefExt; #[cfg(any(ossl102, libressl261))] use crate::x509::verify::{X509VerifyFlags, X509VerifyParamRef}; use crate::x509::{X509Object, X509}; @@ -156,7 +157,7 @@ impl X509Lookup<HashDir> { /// directory. #[corresponds(X509_LOOKUP_hash_dir)] pub fn hash_dir() -> &'static X509LookupMethodRef<HashDir> { - unsafe { X509LookupMethodRef::from_ptr(ffi::X509_LOOKUP_hash_dir()) } + unsafe { X509LookupMethodRef::from_const_ptr(ffi::X509_LOOKUP_hash_dir()) } } } @@ -188,7 +189,7 @@ impl X509Lookup<File> { /// into memory at the time the file is added as a lookup source. #[corresponds(X509_LOOKUP_file)] pub fn file() -> &'static X509LookupMethodRef<File> { - unsafe { X509LookupMethodRef::from_ptr(ffi::X509_LOOKUP_file()) } + unsafe { X509LookupMethodRef::from_const_ptr(ffi::X509_LOOKUP_file()) } } } |