diff options
author | Daniel Neus <[email protected]> | 2016-01-09 12:37:13 +0100 |
---|---|---|
committer | Daniel Neus <[email protected]> | 2016-01-09 12:37:13 +0100 |
commit | f391635f202cf6f83539bd69688975a30f5f874f (patch) | |
tree | 206459e94ab379ba18a8e8035b1855327aa02126 /src/lib/cert/cvc/cvc_ado.cpp | |
parent | 52afcc69d97621e5a3880798d7814a474e71c03b (diff) | |
parent | 791b3dc9947a94d35e6d54b274b0512fb0ebd09c (diff) |
Merge remote-tracking branch 'remotes/github/master' into noreturn
# Conflicts:
# src/build-data/cc/gcc.txt
Diffstat (limited to 'src/lib/cert/cvc/cvc_ado.cpp')
-rw-r--r-- | src/lib/cert/cvc/cvc_ado.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/cert/cvc/cvc_ado.cpp b/src/lib/cert/cvc/cvc_ado.cpp index 21a345808..f803c6bf3 100644 --- a/src/lib/cert/cvc/cvc_ado.cpp +++ b/src/lib/cert/cvc/cvc_ado.cpp @@ -27,7 +27,7 @@ EAC1_1_ADO::EAC1_1_ADO(const std::string& in) void EAC1_1_ADO::force_decode() { std::vector<byte> inner_cert; - BER_Decoder(tbs_bits) + BER_Decoder(m_tbs_bits) .start_cons(ASN1_Tag(33)) .raw_bytes(inner_cert) .end_cons() @@ -42,7 +42,7 @@ void EAC1_1_ADO::force_decode() DataSource_Memory req_source(req_bits); m_req = EAC1_1_Req(req_source); - sig_algo = m_req.sig_algo; + m_sig_algo = m_req.m_sig_algo; } std::vector<byte> EAC1_1_ADO::make_signed(PK_Signer& signer, @@ -101,7 +101,7 @@ void EAC1_1_ADO::encode(Pipe& out, X509_Encoding encoding) const out.write(DER_Encoder() .start_cons(ASN1_Tag(7), APPLICATION) - .raw_bytes(tbs_bits) + .raw_bytes(m_tbs_bits) .encode(concat_sig, OCTET_STRING, ASN1_Tag(55), APPLICATION) .end_cons() .get_contents()); @@ -109,7 +109,7 @@ void EAC1_1_ADO::encode(Pipe& out, X509_Encoding encoding) const std::vector<byte> EAC1_1_ADO::tbs_data() const { - return tbs_bits; + return m_tbs_bits; } bool EAC1_1_ADO::operator==(EAC1_1_ADO const& rhs) const |