aboutsummaryrefslogtreecommitdiffstats
path: root/src/pubkey
diff options
context:
space:
mode:
Diffstat (limited to 'src/pubkey')
-rw-r--r--src/pubkey/dh/info.txt1
-rw-r--r--src/pubkey/dlies/info.txt1
-rw-r--r--src/pubkey/elgamal/info.txt1
-rw-r--r--src/pubkey/keypair/info.txt1
-rw-r--r--src/pubkey/nr/info.txt1
-rw-r--r--src/pubkey/pk_lookup/info.txt18
-rw-r--r--src/pubkey/pk_lookup/look_pk.cpp74
-rw-r--r--src/pubkey/pk_lookup/look_pk.h76
-rw-r--r--src/pubkey/pubkey/info.txt8
-rw-r--r--src/pubkey/pubkey/pk_algs.cpp (renamed from src/pubkey/pk_lookup/pk_algs.cpp)0
-rw-r--r--src/pubkey/pubkey/pk_algs.h (renamed from src/pubkey/pk_lookup/pk_algs.h)0
-rw-r--r--src/pubkey/rsa/info.txt1
-rw-r--r--src/pubkey/rw/info.txt1
13 files changed, 5 insertions, 178 deletions
diff --git a/src/pubkey/dh/info.txt b/src/pubkey/dh/info.txt
index 461184829..5d3396216 100644
--- a/src/pubkey/dh/info.txt
+++ b/src/pubkey/dh/info.txt
@@ -18,5 +18,4 @@ bigint
dl_algo
numbertheory
pubkey
-pk_lookup
</requires>
diff --git a/src/pubkey/dlies/info.txt b/src/pubkey/dlies/info.txt
index a44b40f11..1a09dcbc5 100644
--- a/src/pubkey/dlies/info.txt
+++ b/src/pubkey/dlies/info.txt
@@ -13,5 +13,4 @@ dlies.h
dh
kdf2
pubkey
-pk_lookup
</requires>
diff --git a/src/pubkey/elgamal/info.txt b/src/pubkey/elgamal/info.txt
index 9ca94e3e9..c457e1529 100644
--- a/src/pubkey/elgamal/info.txt
+++ b/src/pubkey/elgamal/info.txt
@@ -11,7 +11,6 @@ bigint
dl_algo
keypair
numbertheory
-pk_lookup
pubkey
</requires>
diff --git a/src/pubkey/keypair/info.txt b/src/pubkey/keypair/info.txt
index 74a0c037d..c6fa4af5d 100644
--- a/src/pubkey/keypair/info.txt
+++ b/src/pubkey/keypair/info.txt
@@ -11,5 +11,4 @@ keypair.h
<requires>
pubkey
-pk_lookup
</requires>
diff --git a/src/pubkey/nr/info.txt b/src/pubkey/nr/info.txt
index 98d1100a0..6434d4385 100644
--- a/src/pubkey/nr/info.txt
+++ b/src/pubkey/nr/info.txt
@@ -19,6 +19,5 @@ bigint
dl_algo
keypair
numbertheory
-pk_lookup
pubkey
</requires>
diff --git a/src/pubkey/pk_lookup/info.txt b/src/pubkey/pk_lookup/info.txt
deleted file mode 100644
index 39dd4dfc2..000000000
--- a/src/pubkey/pk_lookup/info.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-realname "Public Key Lookup"
-
-define PUBLIC_KEY_LOOKUP
-
-load_on dep
-
-<requires>
-asn1
-bigint
-numbertheory
-</requires>
-
-<add>
-look_pk.cpp
-look_pk.h
-pk_algs.cpp
-pk_algs.h
-</add>
diff --git a/src/pubkey/pk_lookup/look_pk.cpp b/src/pubkey/pk_lookup/look_pk.cpp
deleted file mode 100644
index d72c1ce0f..000000000
--- a/src/pubkey/pk_lookup/look_pk.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************
-* PK Algorithm Lookup Source File *
-* (C) 1999-2007 Jack Lloyd *
-*************************************************/
-
-#include <botan/look_pk.h>
-#include <botan/lookup.h>
-
-namespace Botan {
-
-/*************************************************
-* Get a PK_Encryptor object *
-*************************************************/
-PK_Encryptor* get_pk_encryptor(const PK_Encrypting_Key& key,
- const std::string& eme)
- {
- return new PK_Encryptor_MR_with_EME(key, get_eme(eme));
- }
-
-/*************************************************
-* Get a PK_Decryptor object *
-*************************************************/
-PK_Decryptor* get_pk_decryptor(const PK_Decrypting_Key& key,
- const std::string& eme)
- {
- return new PK_Decryptor_MR_with_EME(key, get_eme(eme));
- }
-
-/*************************************************
-* Get a PK_Signer object *
-*************************************************/
-PK_Signer* get_pk_signer(const PK_Signing_Key& key,
- const std::string& emsa,
- Signature_Format sig_format)
- {
- PK_Signer* signer = new PK_Signer(key, get_emsa(emsa));
- signer->set_output_format(sig_format);
- return signer;
- }
-
-/*************************************************
-* Get a PK_Verifier object *
-*************************************************/
-PK_Verifier* get_pk_verifier(const PK_Verifying_with_MR_Key& key,
- const std::string& emsa,
- Signature_Format sig_format)
- {
- PK_Verifier* verifier = new PK_Verifier_with_MR(key, get_emsa(emsa));
- verifier->set_input_format(sig_format);
- return verifier;
- }
-
-/*************************************************
-* Get a PK_Verifier object *
-*************************************************/
-PK_Verifier* get_pk_verifier(const PK_Verifying_wo_MR_Key& key,
- const std::string& emsa,
- Signature_Format sig_format)
- {
- PK_Verifier* verifier = new PK_Verifier_wo_MR(key, get_emsa(emsa));
- verifier->set_input_format(sig_format);
- return verifier;
- }
-
-/*************************************************
-* Get a PK_Key_Agreement object *
-*************************************************/
-PK_Key_Agreement* get_pk_kas(const PK_Key_Agreement_Key& key,
- const std::string& kdf)
- {
- return new PK_Key_Agreement(key, get_kdf(kdf));
- }
-
-}
diff --git a/src/pubkey/pk_lookup/look_pk.h b/src/pubkey/pk_lookup/look_pk.h
deleted file mode 100644
index 926416a41..000000000
--- a/src/pubkey/pk_lookup/look_pk.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************
-* PK Algorithm Lookup Header File *
-* (C) 1999-2007 Jack Lloyd *
-*************************************************/
-
-#ifndef BOTAN_PK_LOOKUP_H__
-#define BOTAN_PK_LOOKUP_H__
-
-#include <botan/build.h>
-#include <botan/pubkey.h>
-
-namespace Botan {
-
-/**
-* Public key encryptor factory method.
-* @param key the key that will work inside the encryptor
-* @param pad determines the algorithm and encoding
-* @return the public key encryptor object
-*/
-BOTAN_DLL PK_Encryptor* get_pk_encryptor(const PK_Encrypting_Key& key,
- const std::string& pad);
-
-/**
-* Public key decryptor factory method.
-* @param key the key that will work inside the decryptor
-* @param pad determines the algorithm and encoding
-* @return the public key decryptor object
-*/
-BOTAN_DLL PK_Decryptor* get_pk_decryptor(const PK_Decrypting_Key& key,
- const std::string& pad);
-
-/**
-* Public key signer factory method.
-* @param key the key that will work inside the signer
-* @param pad determines the algorithm, encoding and hash algorithm
-* @param sig_format the signature format to be used
-* @return the public key signer object
-*/
-BOTAN_DLL PK_Signer* get_pk_signer(const PK_Signing_Key& key,
- const std::string& pad,
- Signature_Format = IEEE_1363);
-
-/**
-* Public key verifier factory method.
-* @param key the key that will work inside the verifier
-* @param pad determines the algorithm, encoding and hash algorithm
-* @param sig_format the signature format to be used
-* @return the public key verifier object
-*/
-BOTAN_DLL PK_Verifier* get_pk_verifier(const PK_Verifying_with_MR_Key& key,
- const std::string& pad,
- Signature_Format = IEEE_1363);
-
-/**
-* Public key verifier factory method.
-* @param key the key that will work inside the verifier
-* @param pad determines the algorithm, encoding and hash algorithm
-* @param sig_form the signature format to be used
-* @return the public key verifier object
-*/
-BOTAN_DLL PK_Verifier* get_pk_verifier(const PK_Verifying_wo_MR_Key& key,
- const std::string& pad,
- Signature_Format sig_form = IEEE_1363);
-
-/**
-* Public key key agreement factory method.
-* @param key the key that will work inside the key agreement
-* @param pad determines the algorithm, encoding and hash algorithm
-* @return the public key verifier object
-*/
-BOTAN_DLL PK_Key_Agreement* get_pk_kas(const PK_Key_Agreement_Key& key,
- const std::string& pad);
-
-}
-
-#endif
diff --git a/src/pubkey/pubkey/info.txt b/src/pubkey/pubkey/info.txt
index 71d56e17e..72fe5b3eb 100644
--- a/src/pubkey/pubkey/info.txt
+++ b/src/pubkey/pubkey/info.txt
@@ -2,7 +2,7 @@ realname "Public Key Base"
define PUBLIC_KEY_CRYPTO
-load_on dep
+load_on auto
<requires>
asn1
@@ -15,14 +15,16 @@ rng
</requires>
<add>
-pubkey_enums.h
-pubkey_enums.cpp
+pk_algs.cpp
+pk_algs.h
pk_keys.cpp
pk_keys.h
pkcs8.cpp
pkcs8.h
pubkey.cpp
pubkey.h
+pubkey_enums.cpp
+pubkey_enums.h
x509_key.cpp
x509_key.h
</add>
diff --git a/src/pubkey/pk_lookup/pk_algs.cpp b/src/pubkey/pubkey/pk_algs.cpp
index 3d33d8f35..3d33d8f35 100644
--- a/src/pubkey/pk_lookup/pk_algs.cpp
+++ b/src/pubkey/pubkey/pk_algs.cpp
diff --git a/src/pubkey/pk_lookup/pk_algs.h b/src/pubkey/pubkey/pk_algs.h
index 2bb9a546e..2bb9a546e 100644
--- a/src/pubkey/pk_lookup/pk_algs.h
+++ b/src/pubkey/pubkey/pk_algs.h
diff --git a/src/pubkey/rsa/info.txt b/src/pubkey/rsa/info.txt
index 378457e2a..ac2b6dde7 100644
--- a/src/pubkey/rsa/info.txt
+++ b/src/pubkey/rsa/info.txt
@@ -10,7 +10,6 @@ bigint
if_algo
keypair
numbertheory
-pk_lookup
pubkey
</requires>
diff --git a/src/pubkey/rw/info.txt b/src/pubkey/rw/info.txt
index 7a29bd568..40c849d1c 100644
--- a/src/pubkey/rw/info.txt
+++ b/src/pubkey/rw/info.txt
@@ -10,7 +10,6 @@ bigint
if_algo
keypair
numbertheory
-pk_lookup
pubkey
</requires>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 14:32:23 +0000