rust/rustls
rust
/
rustls
mirror of https://github.com/ctz/rustls
1
0
Fork 0
Code Issues Releases Wiki Activity

client: simplify extraction of OCSP response

This commit is contained in:
Dirkjan Ochtman 2021-03-09 14:29:58 +01:00
parent 6e019c0848
commit ef917607d0
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rustls/src/client/tls12.rs
View File

@ -93,13 +93,12 @@ impl hs::State for ExpectCertificateStatus {
self.handshake
.transcript
.add_message(&m);
let mut status = require_handshake_msg_mut!(
let server_cert_ocsp_response = require_handshake_msg_mut!(
m,
HandshakeType::CertificateStatus,
HandshakePayload::CertificateStatus
)?;
)?.into_inner();
let server_cert_ocsp_response = status.take_ocsp_response();
trace!(
"Server stapled OCSP response is {:?}",
&server_cert_ocsp_response

6
rustls/src/msgs/handshake.rs
View File

@ -16,7 +16,6 @@ use crate::log::warn;
use std::collections;
use std::fmt;
use std::io::Write;
use std::mem;
use webpki;
macro_rules! declare_u8_vec(
@ -2092,9 +2091,8 @@ impl CertificateStatus {
}
}
pub fn take_ocsp_response(&mut self) -> Vec<u8> {
let new = PayloadU24::new(Vec::new());
mem::replace(&mut self.ocsp_response, new).0
pub fn into_inner(self) -> Vec<u8> {
self.ocsp_response.0
}
}