Build fix

3 files changed, 5 insertions, 3 deletions

diff --git a/src/lib/misc/pbes2/pbes2.cpp b/src/lib/misc/pbes2/pbes2.cpp
index ec5a10ba8..c66b293e8 100644
--- a/src/lib/misc/pbes2/pbes2.cpp
+++ b/src/lib/misc/pbes2/pbes2.cpp
@@ -82,7 +82,7 @@ pbes2_encrypt(const secure_vector<byte>& key_bits,
    std::unique_ptr<Cipher_Mode> enc(get_cipher_mode(cipher, ENCRYPTION));
 
    if(!enc)
-      throw Encoding_Error("PBE-PKCS5 cannot encrypt no cipher " + cipher);
+      throw Decoding_Error("PBE-PKCS5 cannot encrypt no cipher " + cipher);
 
    std::unique_ptr<PBKDF> pbkdf(get_pbkdf("PBKDF2(" + prf + ")"));
 
@@ -157,7 +157,7 @@ pbes2_decrypt(const secure_vector<byte>& key_bits,
    std::unique_ptr<PBKDF> pbkdf(get_pbkdf("PBKDF2(" + prf + ")"));
 
    std::unique_ptr<Cipher_Mode> dec(get_cipher_mode(cipher, DECRYPTION));
-   if(!enc)
+   if(!dec)
       throw Decoding_Error("PBE-PKCS5 cannot decrypt no cipher " + cipher);
 
    if(key_length == 0)
diff --git a/src/lib/misc/pem/pem.cpp b/src/lib/misc/pem/pem.cpp
index 1279b665e..83b48c07b 100644
--- a/src/lib/misc/pem/pem.cpp
+++ b/src/lib/misc/pem/pem.cpp
@@ -8,6 +8,7 @@
 #include <botan/pem.h>
 #include <botan/base64.h>
 #include <botan/parsing.h>
+#include <botan/exceptn.h>
 
 namespace Botan {
 
diff --git a/src/tests/unit_x509.cpp b/src/tests/unit_x509.cpp
index 2040e4bbf..0d3946012 100644
--- a/src/tests/unit_x509.cpp
+++ b/src/tests/unit_x509.cpp
@@ -12,6 +12,7 @@
 
 #include <botan/calendar.h>
 #include <botan/pkcs8.h>
+#include <botan/hash.h>
 #include <botan/pkcs10.h>
 #include <botan/x509self.h>
 #include <botan/x509path.h>
@@ -49,7 +50,7 @@ u64bit key_id(const Public_Key* key)
    hash->update(key->algorithm_identifier().parameters);
    hash->update(key->x509_subject_public_key());
    secure_vector<byte> output = hash->final();
-   return load_be<u64bit>(output.data());
+   return load_be<u64bit>(output.data(), 0);
    }