aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/dh.h4
-rw-r--r--include/dsa.h4
-rw-r--r--include/elgamal.h4
-rw-r--r--include/if_algo.h4
-rw-r--r--include/nr.h4
-rw-r--r--include/pk_algs.h4
-rw-r--r--include/pkcs10.h2
-rw-r--r--include/pkcs8.h18
-rw-r--r--include/rsa.h4
-rw-r--r--include/rw.h4
-rw-r--r--include/x509_ca.h4
-rw-r--r--include/x509_key.h14
-rw-r--r--include/x509cert.h2
-rw-r--r--include/x509self.h4
-rw-r--r--include/x509stor.h2
15 files changed, 39 insertions, 39 deletions
diff --git a/include/dh.h b/include/dh.h
index 3bf2f1c24..6ef519506 100644
--- a/include/dh.h
+++ b/include/dh.h
@@ -25,7 +25,7 @@ class DH_PublicKey : public virtual DL_Scheme_PublicKey
std::string algo_name() const { return "DH"; }
DH_PublicKey() {}
private:
- friend X509_PublicKey* get_public_key(const std::string&);
+ friend Public_Key* get_public_key(const std::string&);
DL_Group::Format group_format() const { return DL_Group::ANSI_X9_42; }
void X509_load_hook();
};
@@ -47,7 +47,7 @@ class DH_PrivateKey : public DH_PublicKey,
DH_PrivateKey(const DL_Group&);
DH_PrivateKey(const DL_Group&, const BigInt&, const BigInt& = 0);
private:
- friend PKCS8_PrivateKey* get_private_key(const std::string&);
+ friend Private_Key* get_private_key(const std::string&);
void PKCS8_load_hook(bool = false);
DH_PrivateKey() {}
diff --git a/include/dsa.h b/include/dsa.h
index 28e2eefbf..f5aed4b9a 100644
--- a/include/dsa.h
+++ b/include/dsa.h
@@ -28,7 +28,7 @@ class DSA_PublicKey : public PK_Verifying_wo_MR_Key,
DSA_Core core;
private:
- friend X509_PublicKey* get_public_key(const std::string&);
+ friend Public_Key* get_public_key(const std::string&);
DL_Group::Format group_format() const { return DL_Group::ANSI_X9_57; }
u32bit message_parts() const { return 2; }
u32bit message_part_size() const;
@@ -50,7 +50,7 @@ class DSA_PrivateKey : public DSA_PublicKey,
DSA_PrivateKey(const DL_Group&);
DSA_PrivateKey(const DL_Group&, const BigInt&, const BigInt& = 0);
private:
- friend PKCS8_PrivateKey* get_private_key(const std::string&);
+ friend Private_Key* get_private_key(const std::string&);
void PKCS8_load_hook(bool = false);
DSA_PrivateKey() {}
};
diff --git a/include/elgamal.h b/include/elgamal.h
index f3ba15bba..9fb15b943 100644
--- a/include/elgamal.h
+++ b/include/elgamal.h
@@ -29,7 +29,7 @@ class ElGamal_PublicKey : public PK_Encrypting_Key,
ELG_Core core;
private:
- friend X509_PublicKey* get_public_key(const std::string&);
+ friend Public_Key* get_public_key(const std::string&);
DL_Group::Format group_format() const { return DL_Group::ANSI_X9_42; }
void X509_load_hook();
};
@@ -49,7 +49,7 @@ class ElGamal_PrivateKey : public ElGamal_PublicKey,
ElGamal_PrivateKey(const DL_Group&);
ElGamal_PrivateKey(const DL_Group&, const BigInt&, const BigInt& = 0);
private:
- friend PKCS8_PrivateKey* get_private_key(const std::string&);
+ friend Private_Key* get_private_key(const std::string&);
void PKCS8_load_hook(bool = false);
ElGamal_PrivateKey() {}
};
diff --git a/include/if_algo.h b/include/if_algo.h
index 550d07440..fa60a9185 100644
--- a/include/if_algo.h
+++ b/include/if_algo.h
@@ -15,7 +15,7 @@ namespace Botan {
/*************************************************
* IF Public Key *
*************************************************/
-class IF_Scheme_PublicKey : public virtual X509_PublicKey
+class IF_Scheme_PublicKey : public virtual Public_Key
{
public:
bool check_key(bool) const;
@@ -39,7 +39,7 @@ class IF_Scheme_PublicKey : public virtual X509_PublicKey
* IF Private Key *
*************************************************/
class IF_Scheme_PrivateKey : public virtual IF_Scheme_PublicKey,
- public virtual PKCS8_PrivateKey
+ public virtual Private_Key
{
public:
bool check_key(bool) const;
diff --git a/include/nr.h b/include/nr.h
index a48985ff6..a71d29f9f 100644
--- a/include/nr.h
+++ b/include/nr.h
@@ -28,7 +28,7 @@ class NR_PublicKey : public PK_Verifying_with_MR_Key,
NR_Core core;
private:
- friend X509_PublicKey* get_public_key(const std::string&);
+ friend Public_Key* get_public_key(const std::string&);
DL_Group::Format group_format() const { return DL_Group::ANSI_X9_57; }
u32bit message_parts() const { return 2; }
u32bit message_part_size() const;
@@ -50,7 +50,7 @@ class NR_PrivateKey : public NR_PublicKey,
NR_PrivateKey(const DL_Group&);
NR_PrivateKey(const DL_Group&, const BigInt&, const BigInt& = 0);
private:
- friend PKCS8_PrivateKey* get_private_key(const std::string&);
+ friend Private_Key* get_private_key(const std::string&);
void PKCS8_load_hook(bool = false);
NR_PrivateKey() {}
};
diff --git a/include/pk_algs.h b/include/pk_algs.h
index f4ac9ae79..2d7d06ea8 100644
--- a/include/pk_algs.h
+++ b/include/pk_algs.h
@@ -14,8 +14,8 @@ namespace Botan {
/*************************************************
* Get an PK key object *
*************************************************/
-X509_PublicKey* get_public_key(const std::string&);
-PKCS8_PrivateKey* get_private_key(const std::string&);
+Public_Key* get_public_key(const std::string&);
+Private_Key* get_private_key(const std::string&);
}
diff --git a/include/pkcs10.h b/include/pkcs10.h
index b7f63b9fb..1353a157a 100644
--- a/include/pkcs10.h
+++ b/include/pkcs10.h
@@ -19,7 +19,7 @@ namespace Botan {
class PKCS10_Request : public X509_Object
{
public:
- X509_PublicKey* subject_public_key() const;
+ Public_Key* subject_public_key() const;
MemoryVector<byte> raw_public_key() const;
X509_DN subject_dn() const;
diff --git a/include/pkcs8.h b/include/pkcs8.h
index 2dd863848..0f3c90a86 100644
--- a/include/pkcs8.h
+++ b/include/pkcs8.h
@@ -47,21 +47,21 @@ namespace PKCS8 {
/*************************************************
* PKCS #8 Private Key Encoding/Decoding *
*************************************************/
-void encode(const PKCS8_PrivateKey&, Pipe&, X509_Encoding = PEM);
-void encrypt_key(const PKCS8_PrivateKey&, Pipe&, const std::string&,
+void encode(const Private_Key&, Pipe&, X509_Encoding = PEM);
+void encrypt_key(const Private_Key&, Pipe&, const std::string&,
const std::string& = "", X509_Encoding = PEM);
-std::string PEM_encode(const PKCS8_PrivateKey&);
-std::string PEM_encode(const PKCS8_PrivateKey&, const std::string&,
+std::string PEM_encode(const Private_Key&);
+std::string PEM_encode(const Private_Key&, const std::string&,
const std::string& = "");
-PKCS8_PrivateKey* load_key(DataSource&, const User_Interface&);
-PKCS8_PrivateKey* load_key(DataSource&, const std::string& = "");
+Private_Key* load_key(DataSource&, const User_Interface&);
+Private_Key* load_key(DataSource&, const std::string& = "");
-PKCS8_PrivateKey* load_key(const std::string&, const User_Interface&);
-PKCS8_PrivateKey* load_key(const std::string&, const std::string& = "");
+Private_Key* load_key(const std::string&, const User_Interface&);
+Private_Key* load_key(const std::string&, const std::string& = "");
-PKCS8_PrivateKey* copy_key(const PKCS8_PrivateKey&);
+Private_Key* copy_key(const Private_Key&);
}
diff --git a/include/rsa.h b/include/rsa.h
index aff873c54..776ddffec 100644
--- a/include/rsa.h
+++ b/include/rsa.h
@@ -27,7 +27,7 @@ class RSA_PublicKey : public PK_Encrypting_Key,
std::string algo_name() const { return "RSA"; }
RSA_PublicKey() {}
private:
- friend X509_PublicKey* get_public_key(const std::string&);
+ friend Public_Key* get_public_key(const std::string&);
};
/*************************************************
@@ -48,7 +48,7 @@ class RSA_PrivateKey : public RSA_PublicKey,
const BigInt& = 0, const BigInt& = 0);
RSA_PrivateKey(u32bit, u32bit = 65537);
private:
- friend PKCS8_PrivateKey* get_private_key(const std::string&);
+ friend Private_Key* get_private_key(const std::string&);
BigInt private_op(const byte[], u32bit) const;
RSA_PrivateKey() {}
};
diff --git a/include/rw.h b/include/rw.h
index f2c8729bc..fb3378191 100644
--- a/include/rw.h
+++ b/include/rw.h
@@ -25,7 +25,7 @@ class RW_PublicKey : public PK_Verifying_with_MR_Key,
std::string algo_name() const { return "RW"; }
RW_PublicKey() {}
private:
- friend X509_PublicKey* get_public_key(const std::string&);
+ friend Public_Key* get_public_key(const std::string&);
};
/*************************************************
@@ -44,7 +44,7 @@ class RW_PrivateKey : public RW_PublicKey,
const BigInt& = 0, const BigInt& = 0);
RW_PrivateKey(u32bit, u32bit = 2);
private:
- friend PKCS8_PrivateKey* get_private_key(const std::string&);
+ friend Private_Key* get_private_key(const std::string&);
RW_PrivateKey() {}
};
diff --git a/include/x509_ca.h b/include/x509_ca.h
index 4442601bb..a19259d1c 100644
--- a/include/x509_ca.h
+++ b/include/x509_ca.h
@@ -35,7 +35,7 @@ class X509_CA
const X509_DN&, const X509_DN&,
const Extensions&);
- X509_CA(const X509_Certificate&, const PKCS8_PrivateKey&);
+ X509_CA(const X509_Certificate&, const Private_Key&);
~X509_CA();
private:
X509_CA(const X509_CA&) {}
@@ -51,7 +51,7 @@ class X509_CA
/*************************************************
* Choose a signing format for the key *
*************************************************/
-PK_Signer* choose_sig_format(const PKCS8_PrivateKey&, AlgorithmIdentifier&);
+PK_Signer* choose_sig_format(const Private_Key&, AlgorithmIdentifier&);
}
diff --git a/include/x509_key.h b/include/x509_key.h
index c0b7c24d7..651c63fde 100644
--- a/include/x509_key.h
+++ b/include/x509_key.h
@@ -39,16 +39,16 @@ namespace X509 {
/*************************************************
* X.509 Public Key Encoding/Decoding *
*************************************************/
-void encode(const X509_PublicKey&, Pipe&, X509_Encoding = PEM);
-std::string PEM_encode(const X509_PublicKey&);
+void encode(const Public_Key&, Pipe&, X509_Encoding = PEM);
+std::string PEM_encode(const Public_Key&);
-X509_PublicKey* load_key(DataSource&);
-X509_PublicKey* load_key(const std::string&);
-X509_PublicKey* load_key(const MemoryRegion<byte>&);
+Public_Key* load_key(DataSource&);
+Public_Key* load_key(const std::string&);
+Public_Key* load_key(const MemoryRegion<byte>&);
-X509_PublicKey* copy_key(const X509_PublicKey&);
+Public_Key* copy_key(const Public_Key&);
-Key_Constraints find_constraints(const X509_PublicKey&, Key_Constraints);
+Key_Constraints find_constraints(const Public_Key&, Key_Constraints);
}
diff --git a/include/x509cert.h b/include/x509cert.h
index d8fa5b313..f2d2cb425 100644
--- a/include/x509cert.h
+++ b/include/x509cert.h
@@ -21,7 +21,7 @@ static const u32bit NO_CERT_PATH_LIMIT = 0xFFFFFFF0;
class X509_Certificate : public X509_Object
{
public:
- X509_PublicKey* subject_public_key() const;
+ Public_Key* subject_public_key() const;
X509_DN issuer_dn() const;
X509_DN subject_dn() const;
diff --git a/include/x509self.h b/include/x509self.h
index 439535fce..291b3f761 100644
--- a/include/x509self.h
+++ b/include/x509self.h
@@ -56,13 +56,13 @@ namespace X509 {
* Create a self-signed X.509 certificate *
*************************************************/
X509_Certificate create_self_signed_cert(const X509_Cert_Options&,
- const PKCS8_PrivateKey&);
+ const Private_Key&);
/*************************************************
* Create a PKCS #10 certificate request *
*************************************************/
PKCS10_Request create_cert_req(const X509_Cert_Options&,
- const PKCS8_PrivateKey&);
+ const Private_Key&);
}
diff --git a/include/x509stor.h b/include/x509stor.h
index fd26cd2bd..9cb747a22 100644
--- a/include/x509stor.h
+++ b/include/x509stor.h
@@ -76,7 +76,7 @@ class X509_Store
void add_new_certstore(Certificate_Store*);
- static X509_Code check_sig(const X509_Object&, X509_PublicKey*);
+ static X509_Code check_sig(const X509_Object&, Public_Key*);
X509_Store();
X509_Store(const X509_Store&);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 14:46:51 +0000