Fix for amalgamation build problems

- fixed broken tls_magic.h include
- added forward declarations for Handshake_IO and Handshake_Hash in
tls_handshake_msg.h
- comment after #endif in tls_server_handshake.h caused surplus #endif
  in botan_all_internal.h
- removed unnecessary semicolons causing -Wpedantic warnings.

4 files changed, 13 insertions, 7 deletions

diff --git a/src/lib/tls/tls_handshake_msg.h b/src/lib/tls/tls_handshake_msg.h
index c53f73a3c..f098e7e81 100644
--- a/src/lib/tls/tls_handshake_msg.h
+++ b/src/lib/tls/tls_handshake_msg.h
@@ -17,6 +17,9 @@ namespace Botan {
 
 namespace TLS {
 
+class Handshake_IO;
+class Handshake_Hash;
+
 /**
 * TLS Handshake Message Base Class
 */
@@ -27,15 +30,16 @@ class BOTAN_DLL Handshake_Message
          {
              public:
                  Handshake_Info(Handshake_IO& io, Handshake_Hash& hash)
-                     : m_io(io), m_hash(hash) {};
+                     : m_io(io), m_hash(hash) {}
 
-                 Handshake_IO& get_io() { return m_io; };
-                 Handshake_Hash& get_hash() {return m_hash; };
+                 Handshake_IO& get_io() { return m_io; }
+                 Handshake_Hash& get_hash() {return m_hash; }
 
              private:
                  Handshake_IO& m_io;
                  Handshake_Hash& m_hash;
          };
+
       std::string type_string() const;
 
       virtual Handshake_Type type() const = 0;
diff --git a/src/lib/tls/tls_server.cpp b/src/lib/tls/tls_server.cpp
index de1e8668d..b1fff5fec 100644
--- a/src/lib/tls/tls_server.cpp
+++ b/src/lib/tls/tls_server.cpp
@@ -8,9 +8,10 @@
 
 #include <botan/tls_server.h>
 #include <botan/internal/tls_handshake_state.h>
+#include <botan/internal/tls_server_handshake_state.h>
 #include <botan/internal/tls_messages.h>
 #include <botan/internal/stl_util.h>
-#include "tls_magic.h"
+#include <botan/tls_magic.h>
 
 namespace Botan {
 
diff --git a/src/lib/tls/tls_server.h b/src/lib/tls/tls_server.h
index 72834785e..a371fd24b 100644
--- a/src/lib/tls/tls_server.h
+++ b/src/lib/tls/tls_server.h
@@ -11,15 +11,15 @@
 
 #include <botan/tls_channel.h>
 #include <botan/credentials_manager.h>
-#include <botan/internal/tls_server_handshake_state.h>
 #include <vector>
 
 
-
 namespace Botan {
 
 namespace TLS {
 
+class Server_Handshake_State;
+
 /**
 * TLS Server
 */
diff --git a/src/lib/tls/tls_server_handshake_state.h b/src/lib/tls/tls_server_handshake_state.h
index 281dd82df..c65cade96 100644
--- a/src/lib/tls/tls_server_handshake_state.h
+++ b/src/lib/tls/tls_server_handshake_state.h
@@ -44,4 +44,5 @@ class Server_Handshake_State : public Handshake_State
 }
 
 }
-#endif //BOTAN_TLS_SERVER_HANDSHAKE_STATE_H__
+
+#endif