Skip to content

Commit 5095d7d

Browse files
authored
Merge pull request #2237 from mspublic/boringssl-keylog
Add boringssl keylog callback support
2 parents daaca3f + 3b11656 commit 5095d7d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

openssl/src/ssl/callbacks.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use std::ffi::CStr;
1111
use std::mem;
1212
use std::ptr;
1313
use std::slice;
14-
#[cfg(ossl111)]
14+
#[cfg(any(ossl111, boringssl))]
1515
use std::str;
1616
use std::sync::Arc;
1717

@@ -28,7 +28,7 @@ use crate::ssl::{
2828
};
2929
#[cfg(ossl111)]
3030
use crate::ssl::{ClientHelloResponse, ExtensionContext};
31-
#[cfg(ossl111)]
31+
#[cfg(any(ossl111, boringssl))]
3232
use crate::util::ForeignTypeRefExt;
3333
#[cfg(ossl111)]
3434
use crate::x509::X509Ref;
@@ -429,7 +429,7 @@ where
429429
}
430430
}
431431

432-
#[cfg(ossl111)]
432+
#[cfg(any(ossl111, boringssl))]
433433
pub unsafe extern "C" fn raw_keylog<F>(ssl: *const ffi::SSL, line: *const c_char)
434434
where
435435
F: Fn(&SslRef, &str) + 'static + Sync + Send,

openssl/src/ssl/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1470,7 +1470,7 @@ impl SslContextBuilder {
14701470
///
14711471
/// Requires OpenSSL 1.1.1 or newer.
14721472
#[corresponds(SSL_CTX_set_keylog_callback)]
1473-
#[cfg(ossl111)]
1473+
#[cfg(any(ossl111, boringssl))]
14741474
pub fn set_keylog_callback<F>(&mut self, callback: F)
14751475
where
14761476
F: Fn(&SslRef, &str) + 'static + Sync + Send,

0 commit comments

Comments
 (0)