corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset af229d7b8c35 (bug 1947513) for causing build bustages.

Browse Source
This commit is contained in:
Stanca Serban
2025-03-21 06:22:39 +02:00
parent dfcc675d76
commit ab793e455b
4 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@@ -5548,7 +5548,6 @@ name = "rsclientcerts"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"gecko-profiler",
"pkcs11-bindings", "pkcs11-bindings",
] ]

2
security/manager/ssl/osclientcerts/src/lib.rs
View File

@@ -130,7 +130,7 @@ extern "C" fn C_Initialize(_pInitArgs: CK_VOID_PTR) -> CK_RV {
vec![CKM_ECDSA, CKM_RSA_PKCS] vec![CKM_ECDSA, CKM_RSA_PKCS]
}; };
let mut module_state_guard = try_to_get_module_state_guard!(); let mut module_state_guard = try_to_get_module_state_guard!();
let manager_proxy = match ManagerProxy::new("osclientcerts", Backend {}) { let manager_proxy = match ManagerProxy::new(Backend {}) {
Ok(p) => p, Ok(p) => p,
Err(e) => { Err(e) => {
log_with_thread_id!(error, "C_Initialize: ManagerProxy: {}", e); log_with_thread_id!(error, "C_Initialize: ManagerProxy: {}", e);

1
security/manager/ssl/rsclientcerts/Cargo.toml
View File

@@ -7,5 +7,4 @@ license = "MPL-2.0"
[dependencies] [dependencies]
byteorder = "1.3" byteorder = "1.3"
gecko-profiler = { path = "../../../../tools/profiler/rust-api" }
pkcs11-bindings = "0.1" pkcs11-bindings = "0.1"

19
security/manager/ssl/rsclientcerts/src/manager.rs
View File

@@ -120,14 +120,12 @@ pub struct ManagerProxy {
} }
impl ManagerProxy { impl ManagerProxy {
pub fn new<B: ClientCertsBackend + Send + 'static>( pub fn new<B: ClientCertsBackend + Send + 'static>(backend: B) -> Result<ManagerProxy, Error> {
name: &'static str,
backend: B,
) -> Result<ManagerProxy, Error> {
let (proxy_sender, manager_receiver) = channel(); let (proxy_sender, manager_receiver) = channel();
let (manager_sender, proxy_receiver) = channel(); let (manager_sender, proxy_receiver) = channel();
let thread_handle = thread::Builder::new().name(name.into()).spawn(move || { let thread_handle = thread::Builder::new()
gecko_profiler::register_thread(name); .name("osclientcert".into())
.spawn(move || {
let mut real_manager = Manager::new(backend); let mut real_manager = Manager::new(backend);
while let Ok(arguments) = manager_receiver.recv() { while let Ok(arguments) = manager_receiver.recv() {
let results = match arguments { let results = match arguments {
@@ -135,7 +133,9 @@ impl ManagerProxy {
ManagerReturnValue::OpenSession(real_manager.open_session(slot_type)) ManagerReturnValue::OpenSession(real_manager.open_session(slot_type))
} }
ManagerArguments::CloseSession(session_handle) => { ManagerArguments::CloseSession(session_handle) => {
ManagerReturnValue::CloseSession(real_manager.close_session(session_handle)) ManagerReturnValue::CloseSession(
real_manager.close_session(session_handle),
)
} }
ManagerArguments::CloseAllSessions(slot_type) => { ManagerArguments::CloseAllSessions(slot_type) => {
ManagerReturnValue::CloseAllSessions( ManagerReturnValue::CloseAllSessions(
@@ -143,7 +143,9 @@ impl ManagerProxy {
) )
} }
ManagerArguments::StartSearch(session, attrs) => { ManagerArguments::StartSearch(session, attrs) => {
ManagerReturnValue::StartSearch(real_manager.start_search(session, attrs)) ManagerReturnValue::StartSearch(
real_manager.start_search(session, attrs),
)
} }
ManagerArguments::Search(session, max_objects) => { ManagerArguments::Search(session, max_objects) => {
ManagerReturnValue::Search(real_manager.search(session, max_objects)) ManagerReturnValue::Search(real_manager.search(session, max_objects))
@@ -182,7 +184,6 @@ impl ManagerProxy {
break; break;
} }
} }
gecko_profiler::unregister_thread();
}); });
match thread_handle { match thread_handle {
Ok(thread_handle) => Ok(ManagerProxy { Ok(thread_handle) => Ok(ManagerProxy {