diff options
| author | lloyd <[email protected]> | 2011-02-11 14:37:07 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2011-02-11 14:37:07 +0000 |
| commit | e32931ab596731310295592592cd267052664832 (patch) | |
| tree | 41da348fb78e750c3c4be9baaf8b5e05647b8827 /src/cms/cms_dalg.cpp | |
| parent | 5f4f1294b1cf1784f4fd14840a9e0824f4fa8742 (diff) | |
| parent | 0e41e0e8d441ff907f092c718db650cda06e2e1a (diff) | |
propagate from branch 'net.randombit.botan' (head 13a0d36dac3709f3cb88e830ed7f8cab9e7433ab)
to branch 'net.randombit.botan.c++0x' (head 2221ad8796466e7e096645de77ba856a9c902d14)
Diffstat (limited to 'src/cms/cms_dalg.cpp')
| -rw-r--r-- | src/cms/cms_dalg.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/cms/cms_dalg.cpp b/src/cms/cms_dalg.cpp index 2935f3070..9fb5a29f2 100644 --- a/src/cms/cms_dalg.cpp +++ b/src/cms/cms_dalg.cpp @@ -28,7 +28,7 @@ SecureVector<byte> hash_of(const SecureVector<byte>& content, Algorithm_Factory& af = global_state().algorithm_factory(); - std::auto_ptr<HashFunction> hash_fn(af.make_hash_function(hash_name)); + std::unique_ptr<HashFunction> hash_fn(af.make_hash_function(hash_name)); return hash_fn->process(content); } @@ -51,10 +51,11 @@ std::vector<X509_Certificate> get_cert(BER_Decoder& signer_info, iands.decode(issuer); iands.decode(serial); - found = store.get_certs(IandS_Match(issuer, BigInt::encode(serial))); + found = store.get_certs( + X509_Store_Search::by_issuer_and_serial(issuer, serial)); } else if(id.type_tag == 0 && id.class_tag == CONSTRUCTED) - found = store.get_certs(SKID_Match(id.value)); + found = store.get_certs(X509_Store_Search::by_skid(id.value)); else throw Decoding_Error("CMS: Unknown tag for cert identifier"); #endif |