diff options
| author | lloyd <[email protected]> | 2012-04-20 21:52:21 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2012-04-20 21:52:21 +0000 |
| commit | 0adad7dd2c6def13fbb5677d7bcc859ba4cab0b1 (patch) | |
| tree | 4216d78e04a1ac0b17e5e6953e1282db5742b19a | |
| parent | 53e7205e63f79adf4d5fcdcddcd424e224bb7527 (diff) | |
| parent | b6bbdd39e713509696eeef8ace9dae1efe979393 (diff) | |
propagate from branch 'net.randombit.botan' (head fdbd3afd02bcb9b4a7702a922581580297add684)
to branch 'net.randombit.botan.tls-state-machine' (head 5f2f96b909365dc6e0faeccc7fa59470721e807a)
| -rw-r--r-- | checks/pk.cpp | 6 | ||||
| -rw-r--r-- | checks/pk_bench.cpp | 6 | ||||
| -rw-r--r-- | checks/validate.cpp | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/checks/pk.cpp b/checks/pk.cpp index 6291b1566..d45fc59fe 100644 --- a/checks/pk.cpp +++ b/checks/pk.cpp @@ -14,6 +14,12 @@ #include <botan/botan.h> #include <botan/oids.h> +#if defined(BOTAN_HAS_PUBLIC_KEY_CRYPTO) + #include <botan/x509_key.h> + #include <botan/pkcs8.h> + #include <botan/pubkey.h> +#endif + #if defined(BOTAN_HAS_RSA) #include <botan/rsa.h> #endif diff --git a/checks/pk_bench.cpp b/checks/pk_bench.cpp index de8ad0730..682efc043 100644 --- a/checks/pk_bench.cpp +++ b/checks/pk_bench.cpp @@ -10,6 +10,12 @@ #include <botan/oids.h> #include <map> +#if defined(BOTAN_HAS_PUBLIC_KEY_CRYPTO) + #include <botan/x509_key.h> + #include <botan/pkcs8.h> + #include <botan/pubkey.h> +#endif + #if defined(BOTAN_HAS_RSA) #include <botan/rsa.h> #endif diff --git a/checks/validate.cpp b/checks/validate.cpp index 65317604e..3de081d56 100644 --- a/checks/validate.cpp +++ b/checks/validate.cpp @@ -110,6 +110,7 @@ bool keywrap_test(const char* key_str, bool ok = true; +#if defined(BOTAN_HAS_RFC3394_KEYWRAP) try { SymmetricKey key(key_str); @@ -140,6 +141,7 @@ bool keywrap_test(const char* key_str, { std::cout << e.what() << "\n"; } +#endif return ok; } |