aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlloyd <[email protected]>2013-12-31 14:14:22 +0000
committerlloyd <[email protected]>2013-12-31 14:14:22 +0000
commitabefc88850c37fe97b4a8588aa13fcdefd9f7b5e (patch)
tree5beb26d3e1770a56aeeddafb5157a413f8b3605d /src
parentd291e3e82513e046abfdf4b38d38a55483f789fd (diff)
Tests
Diffstat (limited to 'src')
-rw-r--r--src/passhash/passhash9/passhash9.cpp4
-rw-r--r--src/pubkey/x509_key.cpp1
2 files changed, 2 insertions, 3 deletions
diff --git a/src/passhash/passhash9/passhash9.cpp b/src/passhash/passhash9/passhash9.cpp
index eeebb58d4..027ceeb76 100644
--- a/src/passhash/passhash9/passhash9.cpp
+++ b/src/passhash/passhash9/passhash9.cpp
@@ -38,9 +38,9 @@ MessageAuthenticationCode* get_pbkdf_prf(byte alg_id)
else if(alg_id == 2)
return af.make_mac("CMAC(Blowfish)");
else if(alg_id == 3)
- return af.make_mac("CMAC(SHA-384)");
+ return af.make_mac("HMAC(SHA-384)");
else if(alg_id == 4)
- return af.make_mac("CMAC(SHA-512)");
+ return af.make_mac("HMAC(SHA-512)");
}
catch(Algorithm_Not_Found) {}
diff --git a/src/pubkey/x509_key.cpp b/src/pubkey/x509_key.cpp
index 62d626d9b..10395837c 100644
--- a/src/pubkey/x509_key.cpp
+++ b/src/pubkey/x509_key.cpp
@@ -6,7 +6,6 @@
*/
#include <botan/x509_key.h>
-#include <botan/filters.h>
#include <botan/der_enc.h>
#include <botan/ber_dec.h>
#include <botan/pem.h>