зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1649227 - Upgrade authenticator-rs to v0.2.13 r=kjacobs
https://crates.io/crates/authenticator/0.2.13 - Support for Linux on MIPS - Fix a race condition in the main state machine causing repeated signature requests Differential Revision: https://phabricator.services.mozilla.com/D81604
This commit is contained in:
Родитель
5269943007
Коммит
b3dd4acf6b
|
@ -180,9 +180,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "authenticator"
|
name = "authenticator"
|
||||||
version = "0.2.12"
|
version = "0.2.13"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ff593fb4dd388fe452c5e63d4d668699466bd46b571c4b852dfbca4bac8f0706"
|
checksum = "6cc4e983ae4499095b965b8c0c57596ae718fe551d2b04aa2c19c777a02e05a4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"boxfnonce",
|
"boxfnonce",
|
||||||
|
|
|
@ -38,7 +38,6 @@ exclude = [
|
||||||
|
|
||||||
# Excluded because they are used only as dependencies, not top-level targets,
|
# Excluded because they are used only as dependencies, not top-level targets,
|
||||||
# so we don't need to vendor their dev-dependencies.
|
# so we don't need to vendor their dev-dependencies.
|
||||||
"dom/webauthn/u2f-hid-rs",
|
|
||||||
"gfx/webrender_bindings",
|
"gfx/webrender_bindings",
|
||||||
"media/mp4parse-rust/mp4parse",
|
"media/mp4parse-rust/mp4parse",
|
||||||
"media/mp4parse-rust/mp4parse_capi",
|
"media/mp4parse-rust/mp4parse_capi",
|
||||||
|
|
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
@ -28,7 +28,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "authenticator"
|
name = "authenticator"
|
||||||
version = "0.2.12"
|
version = "0.2.13"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
[package]
|
[package]
|
||||||
name = "authenticator"
|
name = "authenticator"
|
||||||
version = "0.2.12"
|
version = "0.2.13"
|
||||||
authors = ["J.C. Jones <jc@mozilla.com>", "Tim Taubert <ttaubert@mozilla.com>", "Kyle Machulis <kyle@nonpolynomial.com>"]
|
authors = ["J.C. Jones <jc@mozilla.com>", "Tim Taubert <ttaubert@mozilla.com>", "Kyle Machulis <kyle@nonpolynomial.com>"]
|
||||||
description = "Library for interacting with CTAP1/2 security keys for Web Authentication. Used by Firefox."
|
description = "Library for interacting with CTAP1/2 security keys for Web Authentication. Used by Firefox."
|
||||||
license = "MPL-2.0"
|
license = "MPL-2.0"
|
||||||
|
|
|
@ -31,16 +31,16 @@ pub const U2FHID_FRAME_TIMEOUT: u32 = 500; // Default frame timeout in ms
|
||||||
pub const U2FHID_TRANS_TIMEOUT: u32 = 3000; // Default message timeout in ms
|
pub const U2FHID_TRANS_TIMEOUT: u32 = 3000; // Default message timeout in ms
|
||||||
|
|
||||||
// U2FHID native commands
|
// U2FHID native commands
|
||||||
pub const U2FHID_PING: u8 = (TYPE_INIT | 0x01); // Echo data through local processor only
|
pub const U2FHID_PING: u8 = TYPE_INIT | 0x01; // Echo data through local processor only
|
||||||
pub const U2FHID_MSG: u8 = (TYPE_INIT | 0x03); // Send U2F message frame
|
pub const U2FHID_MSG: u8 = TYPE_INIT | 0x03; // Send U2F message frame
|
||||||
pub const U2FHID_LOCK: u8 = (TYPE_INIT | 0x04); // Send lock channel command
|
pub const U2FHID_LOCK: u8 = TYPE_INIT | 0x04; // Send lock channel command
|
||||||
pub const U2FHID_INIT: u8 = (TYPE_INIT | 0x06); // Channel initialization
|
pub const U2FHID_INIT: u8 = TYPE_INIT | 0x06; // Channel initialization
|
||||||
pub const U2FHID_WINK: u8 = (TYPE_INIT | 0x08); // Send device identification wink
|
pub const U2FHID_WINK: u8 = TYPE_INIT | 0x08; // Send device identification wink
|
||||||
pub const U2FHID_ERROR: u8 = (TYPE_INIT | 0x3f); // Error response
|
pub const U2FHID_ERROR: u8 = TYPE_INIT | 0x3f; // Error response
|
||||||
|
|
||||||
// U2FHID_MSG commands
|
// U2FHID_MSG commands
|
||||||
pub const U2F_VENDOR_FIRST: u8 = (TYPE_INIT | 0x40); // First vendor defined command
|
pub const U2F_VENDOR_FIRST: u8 = TYPE_INIT | 0x40; // First vendor defined command
|
||||||
pub const U2F_VENDOR_LAST: u8 = (TYPE_INIT | 0x7f); // Last vendor defined command
|
pub const U2F_VENDOR_LAST: u8 = TYPE_INIT | 0x7f; // Last vendor defined command
|
||||||
pub const U2F_REGISTER: u8 = 0x01; // Registration command
|
pub const U2F_REGISTER: u8 = 0x01; // Registration command
|
||||||
pub const U2F_AUTHENTICATE: u8 = 0x02; // Authenticate/sign command
|
pub const U2F_AUTHENTICATE: u8 = 0x02; // Authenticate/sign command
|
||||||
pub const U2F_VERSION: u8 = 0x03; // Read version string command
|
pub const U2F_VERSION: u8 = 0x03; // Read version string command
|
||||||
|
|
|
@ -4,7 +4,10 @@
|
||||||
|
|
||||||
// Shared code for platforms that use raw HID access (Linux, FreeBSD, etc.)
|
// Shared code for platforms that use raw HID access (Linux, FreeBSD, etc.)
|
||||||
|
|
||||||
#![cfg_attr(feature = "cargo-clippy", allow(cast_lossless, needless_lifetimes))]
|
#![cfg_attr(
|
||||||
|
feature = "cargo-clippy",
|
||||||
|
allow(clippy::cast_lossless, clippy::needless_lifetimes)
|
||||||
|
)]
|
||||||
|
|
||||||
use std::mem;
|
use std::mem;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
#![cfg_attr(feature = "cargo-clippy", allow(cast_lossless))]
|
#![cfg_attr(feature = "cargo-clippy", allow(clippy::cast_lossless))]
|
||||||
|
|
||||||
extern crate libc;
|
extern crate libc;
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
/* automatically generated by rust-bindgen */
|
||||||
|
|
||||||
|
pub type __u32 = :: std :: os :: raw :: c_uint ; pub const _HIDIOCGRDESCSIZE : __u32 = 1074022401 ; pub const _HIDIOCGRDESC : __u32 = 1342457858 ;
|
|
@ -0,0 +1,3 @@
|
||||||
|
/* automatically generated by rust-bindgen */
|
||||||
|
|
||||||
|
pub type __u32 = :: std :: os :: raw :: c_uint ; pub const _HIDIOCGRDESCSIZE : __u32 = 1074022401 ; pub const _HIDIOCGRDESC : __u32 = 1342457858 ;
|
|
@ -171,7 +171,7 @@ impl StateMachine {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
while alive() {
|
'outer: while alive() {
|
||||||
// If the device matches none of the given key handles
|
// If the device matches none of the given key handles
|
||||||
// then just make it blink with bogus data.
|
// then just make it blink with bogus data.
|
||||||
if valid_handles.is_empty() {
|
if valid_handles.is_empty() {
|
||||||
|
@ -190,7 +190,7 @@ impl StateMachine {
|
||||||
key_handle.credential.clone(),
|
key_handle.credential.clone(),
|
||||||
bytes,
|
bytes,
|
||||||
)));
|
)));
|
||||||
break;
|
break 'outer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
#![cfg_attr(feature = "cargo-clippy", allow(needless_lifetimes))]
|
#![cfg_attr(feature = "cargo-clippy", allow(clippy::needless_lifetimes))]
|
||||||
|
|
||||||
extern crate std;
|
extern crate std;
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ cubeb-sys = { version = "0.7", optional = true, features=["gecko-in-tree"] }
|
||||||
encoding_glue = { path = "../../../../intl/encoding_glue" }
|
encoding_glue = { path = "../../../../intl/encoding_glue" }
|
||||||
audioipc-client = { path = "../../../../media/audioipc/client", optional = true }
|
audioipc-client = { path = "../../../../media/audioipc/client", optional = true }
|
||||||
audioipc-server = { path = "../../../../media/audioipc/server", optional = true }
|
audioipc-server = { path = "../../../../media/audioipc/server", optional = true }
|
||||||
authenticator = "0.2.10"
|
authenticator = "0.2.13"
|
||||||
gkrust_utils = { path = "../../../../xpcom/rust/gkrust_utils" }
|
gkrust_utils = { path = "../../../../xpcom/rust/gkrust_utils" }
|
||||||
gecko_logger = { path = "../../../../xpcom/rust/gecko_logger" }
|
gecko_logger = { path = "../../../../xpcom/rust/gecko_logger" }
|
||||||
rsdparsa_capi = { path = "../../../../media/webrtc/signaling/src/sdp/rsdparsa_capi" }
|
rsdparsa_capi = { path = "../../../../media/webrtc/signaling/src/sdp/rsdparsa_capi" }
|
||||||
|
|
Загрузка…
Ссылка в новой задаче