diff options
| author | lloyd <[email protected]> | 2008-10-01 15:37:15 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2008-10-01 15:37:15 +0000 |
| commit | 0d8e86081eb51c698df28b362453b2ef5654fc7b (patch) | |
| tree | 0a99edff848d1f8284bbdb07ceb6b3991ff1eedb /src/pubkey | |
| parent | 9b8d9c877ffdf544e180112bfb7dede6da5aa5c6 (diff) | |
Handle building Botan with almost all public key code disabled (though only
with the aid of macro hackery, at the moment).
Change DH feature macro to BOTAN_HAS_DIFFIE_HELLMAN
Change NR feature macro to BOTAN_HAS_NYBERG_RUEPPEL
Diffstat (limited to 'src/pubkey')
| -rw-r--r-- | src/pubkey/dh/info.txt | 4 | ||||
| -rw-r--r-- | src/pubkey/nr/info.txt | 2 | ||||
| -rw-r--r-- | src/pubkey/pubkey/pk_algs.cpp | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/pubkey/dh/info.txt b/src/pubkey/dh/info.txt index a54188c57..7c38b027e 100644 --- a/src/pubkey/dh/info.txt +++ b/src/pubkey/dh/info.txt @@ -1,6 +1,6 @@ -realname "DH" +realname "Diffie-Hellman Key Agreement" -define DH +define DIFFIE_HELLMAN load_on auto diff --git a/src/pubkey/nr/info.txt b/src/pubkey/nr/info.txt index b574af0e7..6434d4385 100644 --- a/src/pubkey/nr/info.txt +++ b/src/pubkey/nr/info.txt @@ -1,6 +1,6 @@ realname "Nyberg-Rueppel" -define NR +define NYBERG_RUEPPEL load_on auto diff --git a/src/pubkey/pubkey/pk_algs.cpp b/src/pubkey/pubkey/pk_algs.cpp index 3c1b81ba9..c1fc569a0 100644 --- a/src/pubkey/pubkey/pk_algs.cpp +++ b/src/pubkey/pubkey/pk_algs.cpp @@ -13,7 +13,7 @@ #include <botan/dsa.h> #endif -#ifdef BOTAN_HAS_DH +#ifdef BOTAN_HAS_DIFFIE_HELLMAN #include <botan/dh.h> #endif @@ -21,7 +21,7 @@ #include <botan/ec.h> #endif -#ifdef BOTAN_HAS_NR +#ifdef BOTAN_HAS_NYBERG_RUEPPEL #include <botan/nr.h> #endif @@ -48,11 +48,11 @@ Public_Key* get_public_key(const std::string& alg_name) if(alg_name == "DSA") return new DSA_PublicKey; #endif -#if defined(BOTAN_HAS_DH) +#if defined(BOTAN_HAS_DIFFIE_HELLMAN) if(alg_name == "DH") return new DH_PublicKey; #endif -#if defined(BOTAN_HAS_NR) +#if defined(BOTAN_HAS_NYBERG_RUEPPEL) if(alg_name == "NR") return new NR_PublicKey; #endif @@ -84,11 +84,11 @@ Private_Key* get_private_key(const std::string& alg_name) if(alg_name == "DSA") return new DSA_PrivateKey; #endif -#if defined(BOTAN_HAS_DH) +#if defined(BOTAN_HAS_DIFFIE_HELLMAN) if(alg_name == "DH") return new DH_PrivateKey; #endif -#if defined(BOTAN_HAS_NR) +#if defined(BOTAN_HAS_NYBERG_RUEPPEL) if(alg_name == "NR") return new NR_PrivateKey; #endif |