diff options
| author | lloyd <[email protected]> | 2012-06-07 23:58:28 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-06-07 23:58:28 +0000 |
| commit | 1ca43e0c8caba8b2517122b46e83bf4ca5d79005 (patch) | |
| tree | a1365d38c763cfd66844f7ad29f1f19ce05d15cd /src/cert/cvc/cvc_cert.cpp | |
| parent | 8a7eb1f73c503b289a6f4bc56f5ebef806c9d4e6 (diff) | |
Update cms, cvc, zlib, bzip2, openssl, and gnump modules for the new
allocator interface. The compression filters now just use malloc/free
with a memset.
Add a new info.txt field <warning>, like comment but warns. Use for
CMS which is pretty broken (doesn't even compile anymore), and for TLS.
Diffstat (limited to 'src/cert/cvc/cvc_cert.cpp')
| -rw-r--r-- | src/cert/cvc/cvc_cert.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cert/cvc/cvc_cert.cpp b/src/cert/cvc/cvc_cert.cpp index 12558bb80..3ab78b7d4 100644 --- a/src/cert/cvc/cvc_cert.cpp +++ b/src/cert/cvc/cvc_cert.cpp @@ -33,8 +33,8 @@ u32bit EAC1_1_CVC::get_chat_value() const */ void EAC1_1_CVC::force_decode() { - secure_vector<byte> enc_pk; - secure_vector<byte> enc_chat_val; + std::vector<byte> enc_pk; + std::vector<byte> enc_chat_val; size_t cpi; BER_Decoder tbs_cert(tbs_bits); tbs_cert.decode(cpi, ASN1_Tag(41), APPLICATION) @@ -88,7 +88,7 @@ bool EAC1_1_CVC::operator==(EAC1_1_CVC const& rhs) const && get_concat_sig() == rhs.get_concat_sig()); } -ECDSA_PublicKey* decode_eac1_1_key(const secure_vector<byte>&, +ECDSA_PublicKey* decode_eac1_1_key(const std::vector<byte>&, AlgorithmIdentifier&) { throw Internal_Error("decode_eac1_1_key: Unimplemented"); @@ -96,7 +96,7 @@ ECDSA_PublicKey* decode_eac1_1_key(const secure_vector<byte>&, } EAC1_1_CVC make_cvc_cert(PK_Signer& signer, - secure_vector<byte> const& public_key, + const std::vector<byte>& public_key, ASN1_Car const& car, ASN1_Chr const& chr, byte holder_auth_templ, @@ -121,7 +121,7 @@ EAC1_1_CVC make_cvc_cert(PK_Signer& signer, .end_cons() .encode(ced) .encode(cex) - .get_contents(); + .get_contents_unlocked(); std::vector<byte> signed_cert = EAC1_1_CVC::make_signed(signer, |