diff options
| author | lloyd <[email protected]> | 2010-02-24 13:23:12 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-02-24 13:23:12 +0000 |
| commit | 27d84b179913a82849c3994e8724dbec379dab52 (patch) | |
| tree | 83634362c2d0ee146ef9a2104722dc3f5491088d /src/cms/cms_dec.cpp | |
| parent | 7424a5b5102b569e3c052cb195c98b5d1b60ce30 (diff) | |
| parent | f849aab38b36c68217e98d1bfc8d8ef8f0e3c027 (diff) | |
propagate from branch 'net.randombit.botan' (head 2b67727dd9d1e7fe34f3cb7b7f6715ba42a04918)
to branch 'net.randombit.botan.c++0x' (head 1e2e1596f2b4928c2b7bfba624ea5e4ac69dfdad)
Diffstat (limited to 'src/cms/cms_dec.cpp')
| -rw-r--r-- | src/cms/cms_dec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cms/cms_dec.cpp b/src/cms/cms_dec.cpp index 222399f6c..038d01869 100644 --- a/src/cms/cms_dec.cpp +++ b/src/cms/cms_dec.cpp @@ -17,7 +17,7 @@ namespace Botan { * CMS_Decoder Constructor */ CMS_Decoder::CMS_Decoder(DataSource& in, const X509_Store& x509store, - User_Interface& ui_ref, PKCS8_PrivateKey* key) : + User_Interface& ui_ref, Private_Key* key) : ui(ui_ref), store(x509store) { status = GOOD; @@ -57,7 +57,7 @@ void CMS_Decoder::initial_read(DataSource&) /* * Add another private key to use */ -void CMS_Decoder::add_key(PKCS8_PrivateKey* key) +void CMS_Decoder::add_key(Private_Key* key) { if(!key) return; |