Remove use of old typedefs

4 files changed, 10 insertions, 10 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;
diff --git a/src/cms/cms_dec.h b/src/cms/cms_dec.h
index 75b61c9cb..a00b44766 100644
--- a/src/cms/cms_dec.h
+++ b/src/cms/cms_dec.h
@@ -37,10 +37,10 @@ class BOTAN_DLL CMS_Decoder
 
       void next_layer() { decode_layer(); }
 
-      void add_key(PKCS8_PrivateKey*);
+      void add_key(Private_Key*);
 
       CMS_Decoder(DataSource&, const X509_Store&, User_Interface&,
-                  PKCS8_PrivateKey* = 0);
+                  Private_Key* = 0);
    private:
       std::string get_passphrase(const std::string&);
       void read_econtent(BER_Decoder&);
@@ -52,7 +52,7 @@ class BOTAN_DLL CMS_Decoder
 
       X509_Store store;
       std::vector<std::string> passphrases;
-      std::vector<PKCS8_PrivateKey*> keys;
+      std::vector<Private_Key*> keys;
 
       OID type, next_type;
       SecureVector<byte> data;
diff --git a/src/cms/cms_ealg.cpp b/src/cms/cms_ealg.cpp
index 5efa33254..60479a820 100644
--- a/src/cms/cms_ealg.cpp
+++ b/src/cms/cms_ealg.cpp
@@ -97,7 +97,7 @@ void CMS_Encoder::encrypt(RandomNumberGenerator& rng,
    {
    const std::string cipher = choose_algo(user_cipher, "TripleDES");
 
-   std::auto_ptr<X509_PublicKey> key(to.subject_public_key());
+   std::auto_ptr<Public_Key> key(to.subject_public_key());
    const std::string algo = key->algo_name();
 
    Key_Constraints constraints = to.constraints();
@@ -165,7 +165,7 @@ void CMS_Encoder::encrypt_ktri(RandomNumberGenerator& rng,
 */
 void CMS_Encoder::encrypt_kari(RandomNumberGenerator&,
                                const X509_Certificate&,
-                               X509_PublicKey*,
+                               Public_Key*,
                                const std::string&)
    {
    throw Internal_Error("FIXME: unimplemented");
@@ -287,7 +287,7 @@ SecureVector<byte> CMS_Encoder::do_encrypt(RandomNumberGenerator& rng,
 * Sign a message
 */
 void CMS_Encoder::sign(const X509_Certificate& cert,
-                       const PKCS8_PrivateKey& key,
+                       const Private_Key& key,
                        RandomNumberGenerator& rng,
                        const std::vector<X509_Certificate>& chain,
                        const std::string& hash,
diff --git a/src/cms/cms_enc.h b/src/cms/cms_enc.h
index 6fdd2b726..b1e18ef7d 100644
--- a/src/cms/cms_enc.h
+++ b/src/cms/cms_enc.h
@@ -36,7 +36,7 @@ class BOTAN_DLL CMS_Encoder
       void authenticate(const SymmetricKey&, const std::string& = "");
 
       void sign(const X509_Certificate& cert,
-                const PKCS8_PrivateKey& key,
+                const Private_Key& key,
                 RandomNumberGenerator& rng,
                 const std::vector<X509_Certificate>& cert_chain,
                 const std::string& hash,
@@ -62,7 +62,7 @@ class BOTAN_DLL CMS_Encoder
                         const X509_Certificate&, PK_Encrypting_Key*,
                         const std::string&);
       void encrypt_kari(RandomNumberGenerator&,
-                        const X509_Certificate&, X509_PublicKey*,
+                        const X509_Certificate&, Public_Key*,
                         const std::string&);
 
       SecureVector<byte> do_encrypt(RandomNumberGenerator& rng,