botan: Add MD5 support to Botan hasher

Support MD5 in the Botan plugin if supported by Botan.
MD5 is required for RADIUS and obviously EAP-MD5,
and also for non-PKCS#8 encoded, encrypted private keys.

diff --git a/src/libstrongswan/plugins/botan/botan_hasher.c b/src/libstrongswan/plugins/botan/botan_hasher.c
index f3caec3876f9ecd752cb84ec95be2d7b8a3d32c3..06b2ad9b2d937d3a2a2675ede507f54fe7540ecd 100644 (file)
--- a/src/libstrongswan/plugins/botan/botan_hasher.c
+++ b/src/libstrongswan/plugins/botan/botan_hasher.c
@@ -112,6 +112,9 @@ botan_hasher_t *botan_hasher_create(hash_algorithm_t algo)
 
        switch (algo)
        {
+               case HASH_MD5:
+                       hash_name = "MD5";
+                       break;
                case HASH_SHA1:
                        hash_name = "SHA-1";
                        break;

diff --git a/src/libstrongswan/plugins/botan/botan_hasher.h b/src/libstrongswan/plugins/botan/botan_hasher.h
index 2cb0bc11749c59dd85d849ca8d5e905d234752e4..164f63711b1816182481b11a806ff2709e7c3617 100644 (file)
--- a/src/libstrongswan/plugins/botan/botan_hasher.h
+++ b/src/libstrongswan/plugins/botan/botan_hasher.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2017 René Korthaus, Rohde & Schwarz Cybersecurity
+ * Copyright (C) 2018 René Korthaus
+ * Rohde & Schwarz Cybersecurity GmbH
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/libstrongswan/plugins/botan/botan_plugin.c b/src/libstrongswan/plugins/botan/botan_plugin.c
index 3bc38832180b77eece10576fcd221f107ae4d61c..0fb9159c19818b3d231d76c4fa2e70bc6181370f 100644 (file)
--- a/src/libstrongswan/plugins/botan/botan_plugin.c
+++ b/src/libstrongswan/plugins/botan/botan_plugin.c
@@ -102,6 +102,9 @@ METHOD(plugin_t, get_features, int,
 #endif
                /* hashers */
                PLUGIN_REGISTER(HASHER, botan_hasher_create),
+#ifdef BOTAN_HAS_MD5
+                       PLUGIN_PROVIDE(HASHER, HASH_MD5),
+#endif
 #ifdef BOTAN_HAS_SHA1
                        PLUGIN_PROVIDE(HASHER, HASH_SHA1),
 #endif