aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/engine/def_engine/def_pk_ops.cpp4
-rw-r--r--src/engine/def_engine/default_engine.h4
-rw-r--r--src/engine/engine.h4
-rw-r--r--src/pubkey/dh/dh.h2
-rw-r--r--src/pubkey/dsa/dsa.h2
-rw-r--r--src/pubkey/ecdh/ecdh.h2
-rw-r--r--src/pubkey/ecdsa/ecdsa.h2
-rw-r--r--src/pubkey/gost_3410/gost_3410.h2
-rw-r--r--src/pubkey/nr/nr.h2
-rw-r--r--src/pubkey/pk_ops.h8
-rw-r--r--src/pubkey/pubkey.h4
-rw-r--r--src/pubkey/rsa/rsa.h2
-rw-r--r--src/pubkey/rw/rw.h2
13 files changed, 20 insertions, 20 deletions
diff --git a/src/engine/def_engine/def_pk_ops.cpp b/src/engine/def_engine/def_pk_ops.cpp
index ce23cd8db..7dd7e0219 100644
--- a/src/engine/def_engine/def_pk_ops.cpp
+++ b/src/engine/def_engine/def_pk_ops.cpp
@@ -48,7 +48,7 @@
namespace Botan {
-PK_Ops::KA_Operation*
+PK_Ops::Key_Agreement*
Default_Engine::get_key_agreement_op(const Private_Key& key) const
{
#if defined(BOTAN_HAS_DIFFIE_HELLMAN)
@@ -64,7 +64,7 @@ Default_Engine::get_key_agreement_op(const Private_Key& key) const
return 0;
}
-PK_Ops::Signature_Operation*
+PK_Ops::Signature*
Default_Engine::get_signature_op(const Private_Key& key) const
{
#if defined(BOTAN_HAS_RSA)
diff --git a/src/engine/def_engine/default_engine.h b/src/engine/def_engine/default_engine.h
index d74f61459..b77f5ce91 100644
--- a/src/engine/def_engine/default_engine.h
+++ b/src/engine/def_engine/default_engine.h
@@ -20,10 +20,10 @@ class Default_Engine : public Engine
public:
std::string provider_name() const { return "core"; }
- PK_Ops::KA_Operation*
+ PK_Ops::Key_Agreement*
get_key_agreement_op(const Private_Key& key) const;
- PK_Ops::Signature_Operation*
+ PK_Ops::Signature*
get_signature_op(const Private_Key& key) const;
PK_Ops::Verification* get_verify_op(const Public_Key& key) const;
diff --git a/src/engine/engine.h b/src/engine/engine.h
index c62a7f956..c45718662 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -70,13 +70,13 @@ class BOTAN_DLL Engine
Algorithm_Factory&)
{ return 0; }
- virtual PK_Ops::KA_Operation*
+ virtual PK_Ops::Key_Agreement*
get_key_agreement_op(const Private_Key&) const
{
return 0;
}
- virtual PK_Ops::Signature_Operation*
+ virtual PK_Ops::Signature*
get_signature_op(const Private_Key&) const
{
return 0;
diff --git a/src/pubkey/dh/dh.h b/src/pubkey/dh/dh.h
index 318a6215c..ed8caf0c1 100644
--- a/src/pubkey/dh/dh.h
+++ b/src/pubkey/dh/dh.h
@@ -74,7 +74,7 @@ class BOTAN_DLL DH_PrivateKey : public DH_PublicKey,
/**
* DH operation
*/
-class BOTAN_DLL DH_KA_Operation : public PK_Ops::KA_Operation
+class BOTAN_DLL DH_KA_Operation : public PK_Ops::Key_Agreement
{
public:
diff --git a/src/pubkey/dsa/dsa.h b/src/pubkey/dsa/dsa.h
index f8db77a1b..7745e08ff 100644
--- a/src/pubkey/dsa/dsa.h
+++ b/src/pubkey/dsa/dsa.h
@@ -59,7 +59,7 @@ class BOTAN_DLL DSA_PrivateKey : public DSA_PublicKey,
bool check_key(RandomNumberGenerator& rng, bool strong) const;
};
-class BOTAN_DLL DSA_Signature_Operation : public PK_Ops::Signature_Operation
+class BOTAN_DLL DSA_Signature_Operation : public PK_Ops::Signature
{
public:
DSA_Signature_Operation(const DSA_PrivateKey& dsa);
diff --git a/src/pubkey/ecdh/ecdh.h b/src/pubkey/ecdh/ecdh.h
index 92796d961..ef589d982 100644
--- a/src/pubkey/ecdh/ecdh.h
+++ b/src/pubkey/ecdh/ecdh.h
@@ -100,7 +100,7 @@ class BOTAN_DLL ECDH_PrivateKey : public ECDH_PublicKey,
/**
* ECDH operation
*/
-class BOTAN_DLL ECDH_KA_Operation : public PK_Ops::KA_Operation
+class BOTAN_DLL ECDH_KA_Operation : public PK_Ops::Key_Agreement
{
public:
ECDH_KA_Operation(const ECDH_PrivateKey& key);
diff --git a/src/pubkey/ecdsa/ecdsa.h b/src/pubkey/ecdsa/ecdsa.h
index 4331cd87c..c26e47354 100644
--- a/src/pubkey/ecdsa/ecdsa.h
+++ b/src/pubkey/ecdsa/ecdsa.h
@@ -98,7 +98,7 @@ class BOTAN_DLL ECDSA_PrivateKey : public ECDSA_PublicKey,
EC_PrivateKey(domain, x) {}
};
-class BOTAN_DLL ECDSA_Signature_Operation : public PK_Ops::Signature_Operation
+class BOTAN_DLL ECDSA_Signature_Operation : public PK_Ops::Signature
{
public:
ECDSA_Signature_Operation(const ECDSA_PrivateKey& ecdsa);
diff --git a/src/pubkey/gost_3410/gost_3410.h b/src/pubkey/gost_3410/gost_3410.h
index 3def2cfb9..ffaa6fc4e 100644
--- a/src/pubkey/gost_3410/gost_3410.h
+++ b/src/pubkey/gost_3410/gost_3410.h
@@ -108,7 +108,7 @@ class BOTAN_DLL GOST_3410_PrivateKey : public GOST_3410_PublicKey,
{ return EC_PublicKey::algorithm_identifier(); }
};
-class BOTAN_DLL GOST_3410_Signature_Operation : public PK_Ops::Signature_Operation
+class BOTAN_DLL GOST_3410_Signature_Operation : public PK_Ops::Signature
{
public:
GOST_3410_Signature_Operation(const GOST_3410_PrivateKey& gost_3410);
diff --git a/src/pubkey/nr/nr.h b/src/pubkey/nr/nr.h
index c6c7d871c..3fe0efeb5 100644
--- a/src/pubkey/nr/nr.h
+++ b/src/pubkey/nr/nr.h
@@ -57,7 +57,7 @@ class BOTAN_DLL NR_PrivateKey : public NR_PublicKey,
const BigInt& x = 0);
};
-class BOTAN_DLL NR_Signature_Operation : public PK_Ops::Signature_Operation
+class BOTAN_DLL NR_Signature_Operation : public PK_Ops::Signature
{
public:
NR_Signature_Operation(const NR_PrivateKey& nr);
diff --git a/src/pubkey/pk_ops.h b/src/pubkey/pk_ops.h
index 27190e0c3..cb488a1a0 100644
--- a/src/pubkey/pk_ops.h
+++ b/src/pubkey/pk_ops.h
@@ -15,7 +15,7 @@ namespace Botan {
namespace PK_Ops {
-class Signature_Operation
+class Signature
{
public:
/**
@@ -46,7 +46,7 @@ class Signature_Operation
u32bit msg_len,
RandomNumberGenerator& rng) = 0;
- virtual ~Signature_Operation() {}
+ virtual ~Signature() {}
};
class BOTAN_DLL Verification
@@ -108,7 +108,7 @@ class BOTAN_DLL Verification
/*
* A generic Key Agreement Operation (eg DH or ECDH)
*/
-class BOTAN_DLL KA_Operation
+class BOTAN_DLL Key_Agreement
{
public:
/*
@@ -119,7 +119,7 @@ class BOTAN_DLL KA_Operation
*/
virtual SecureVector<byte> agree(const byte w[], u32bit w_len) const = 0;
- virtual ~KA_Operation() {}
+ virtual ~Key_Agreement() {}
};
}
diff --git a/src/pubkey/pubkey.h b/src/pubkey/pubkey.h
index a1e98fb6e..f63da2b3e 100644
--- a/src/pubkey/pubkey.h
+++ b/src/pubkey/pubkey.h
@@ -161,7 +161,7 @@ class BOTAN_DLL PK_Signer
PK_Signer(const PK_Signer&);
PK_Signer& operator=(const PK_Signer&);
- PK_Ops::Signature_Operation* op;
+ PK_Ops::Signature* op;
EMSA* emsa;
Signature_Format sig_format;
};
@@ -347,7 +347,7 @@ class BOTAN_DLL PK_Key_Agreement
PK_Key_Agreement(const PK_Key_Agreement_Key&);
PK_Key_Agreement& operator=(const PK_Key_Agreement&);
- PK_Ops::KA_Operation* op;
+ PK_Ops::Key_Agreement* op;
KDF* kdf;
};
diff --git a/src/pubkey/rsa/rsa.h b/src/pubkey/rsa/rsa.h
index 72b90fe5a..43abf2a09 100644
--- a/src/pubkey/rsa/rsa.h
+++ b/src/pubkey/rsa/rsa.h
@@ -98,7 +98,7 @@ class BOTAN_DLL RSA_PrivateKey : public RSA_PublicKey,
BigInt private_op(const byte[], u32bit) const;
};
-class BOTAN_DLL RSA_Signature_Operation : public PK_Ops::Signature_Operation
+class BOTAN_DLL RSA_Signature_Operation : public PK_Ops::Signature
{
public:
RSA_Signature_Operation(const RSA_PrivateKey& rsa);
diff --git a/src/pubkey/rw/rw.h b/src/pubkey/rw/rw.h
index 66dfd289e..688e1db7f 100644
--- a/src/pubkey/rw/rw.h
+++ b/src/pubkey/rw/rw.h
@@ -68,7 +68,7 @@ class BOTAN_DLL RW_PrivateKey : public RW_PublicKey,
RandomNumberGenerator& rng) const;
};
-class BOTAN_DLL RW_Signature_Operation : public PK_Ops::Signature_Operation
+class BOTAN_DLL RW_Signature_Operation : public PK_Ops::Signature
{
public:
RW_Signature_Operation(const RW_PrivateKey& rw);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-16 22:20:23 +0000