update to alpha.6
This commit is contained in:
parent
b24ac52817
commit
9af16cef17
5 changed files with 8 additions and 12 deletions
|
|
@ -19,9 +19,9 @@ resolver = "2"
|
|||
[workspace.dependencies]
|
||||
boring = { version = "4", default-features = false }
|
||||
boring-sys = { version = "4", default-features = false }
|
||||
rustls = { version = "=0.22.0-alpha.5", default-features = false }
|
||||
rustls = { version = "=0.22.0-alpha.6", default-features = false }
|
||||
rustls-pemfile = { version = "=2.0.0-alpha.2" }
|
||||
rustls-pki-types = { version = "=0.2.2" }
|
||||
tokio-rustls = { version = "0.25.0-alpha.3" }
|
||||
webpki = { package = "rustls-webpki", version = "0.102.0-alpha.7", default-features = false, features = ["alloc", "std"] }
|
||||
rustls-pki-types = { version = "0.2.3" }
|
||||
tokio-rustls = { version = "0.25.0-alpha.4" }
|
||||
webpki = { package = "rustls-webpki", version = "0.102.0-alpha.7", default-features = false }
|
||||
webpki-roots = { version = "=0.26.0-alpha.2" }
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@ use crate::helper::{cvt, log_and_map};
|
|||
|
||||
pub struct PrfTls1WithDigest(pub boring::nid::Nid);
|
||||
|
||||
pub struct MySecret(Vec<u8>);
|
||||
|
||||
impl crypto::tls12::Prf for PrfTls1WithDigest {
|
||||
fn for_key_exchange(
|
||||
&self,
|
||||
|
|
@ -23,12 +21,7 @@ impl crypto::tls12::Prf for PrfTls1WithDigest {
|
|||
|
||||
let secret = kx.complete(peer_pub_key)?;
|
||||
|
||||
let secret: MySecret = unsafe {
|
||||
// I don't see another way to get to the secret...
|
||||
std::mem::transmute(secret)
|
||||
};
|
||||
|
||||
prf(digest, output, &secret.0, label, seed)
|
||||
prf(digest, output, secret.secret_bytes(), label, seed)
|
||||
.map_err(|e| log_and_map("prf", e, rustls::Error::General("failed on prf".into())))
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ use rustls_pki_types::{InvalidSignature, SignatureVerificationAlgorithm};
|
|||
|
||||
use crate::helper;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct BoringEcVerifier(SignatureScheme);
|
||||
|
||||
impl BoringEcVerifier {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ use rustls_pki_types::{InvalidSignature, SignatureVerificationAlgorithm};
|
|||
|
||||
use crate::helper::{cvt_p, log_and_map};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct BoringEdVerifier(SignatureScheme);
|
||||
|
||||
impl BoringEdVerifier {
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ use spki::der::Reader;
|
|||
|
||||
use crate::helper::log_and_map;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct BoringRsaVerifier(SignatureScheme);
|
||||
|
||||
impl BoringRsaVerifier {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue