diff options
| author | lloyd <[email protected]> | 2011-06-13 17:06:08 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2011-06-13 17:06:08 +0000 |
| commit | 5fcdf6953ed820a446862702311221c10ae0b91d (patch) | |
| tree | 10354a54bb8ef5c8f9c6cdd9fa0142ab0037c635 /src/cms/cms_dalg.cpp | |
| parent | b145e593616e83a4c124bba70d451ef0f03c5f3f (diff) | |
| parent | 1a28f7ef6064041955e7a662c5e087bbea03b6ad (diff) | |
propagate from branch 'net.randombit.botan' (head 150bd11dd8090559ee1e83394b8283bf93a018de)
to branch 'net.randombit.botan.c++0x' (head 7480693bb3f1e8a4e039a3e7ba3d9a7007f9730e)
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 |