renet
/
SaiTLS
10
1
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

ec cert: fix formatting

master
occheung 2020-11-20 12:07:45 +08:00
parent 21234c485d
commit 7597e41859
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/session.rs
View File

@ -610,7 +610,14 @@ impl<'a> Session<'a> {
.verify_digest( .verify_digest(
verify_hash, &ecdsa_signature verify_hash, &ecdsa_signature
).unwrap(); ).unwrap();
return
// Usual procedures: update hash
self.hash.update(cert_verify_slice);
// At last, update client state
self.state = TlsState::WAIT_FINISHED;
return;
} }
if signature_algorithm == SignatureScheme::ed25519 { if signature_algorithm == SignatureScheme::ed25519 {
@ -628,7 +635,14 @@ impl<'a> Session<'a> {
.unwrap() .unwrap()
.verify_prehashed(verify_hash, None, &ed25519_signature) .verify_prehashed(verify_hash, None, &ed25519_signature)
.unwrap(); .unwrap();
return
// Usual procedures: update hash
self.hash.update(cert_verify_slice);
// At last, update client state
self.state = TlsState::WAIT_FINISHED;
return;
} }
// Get verification hash, and verify the signature // Get verification hash, and verify the signature
@ -1275,7 +1289,7 @@ impl<'a> Session<'a> {
use p256::ecdsa::signature::DigestSigner; use p256::ecdsa::signature::DigestSigner;
let sig_vec = alloc::vec::Vec::from( let sig_vec = alloc::vec::Vec::from(
cert_signing_key.sign_digest(verify_hash).as_ref() cert_signing_key.sign_digest(verify_hash).to_asn1().as_ref()
); );
( (

14
src/tls.rs
View File

@ -748,12 +748,14 @@ impl<'s, R: RngCore + CryptoRng> TlsSocket<'s, R> {
// Perform verification, update TLS state if successful // Perform verification, update TLS state if successful
let (sig_alg, signature) = might_be_cert_verify.get_signature().unwrap(); let (sig_alg, signature) = might_be_cert_verify.get_signature().unwrap();
self.session.borrow_mut() {
.client_update_for_wait_cv( self.session.borrow_mut()
cert_verify_slice, .client_update_for_wait_cv(
sig_alg, cert_verify_slice,
signature sig_alg,
); signature
);
}
log::info!("Received CV"); log::info!("Received CV");
}, },