Fix header guards for amalgamation (github issue 35)

4 files changed, 31 insertions, 31 deletions

diff --git a/src/lib/pubkey/mce/code_based_key_gen.h b/src/lib/pubkey/mce/code_based_key_gen.h
index 80201ebf5..15b417fb6 100644
--- a/src/lib/pubkey/mce/code_based_key_gen.h
+++ b/src/lib/pubkey/mce/code_based_key_gen.h
@@ -1,4 +1,3 @@
-
 /**
  * (C) Copyright Projet SECRET, INRIA, Rocquencourt
  * (C) Bhaskar Biswas and  Nicolas Sendrier
@@ -9,8 +8,9 @@
  * Distributed under the terms of the Botan license
  *
  */
-#ifndef __code_based_key_gen__H_
-#define __code_based_key_gen__H_
+
+#ifndef BOTAN_CODE_BASED_KEY_GEN_H__
+#define BOTAN_CODE_BASED_KEY_GEN_H__
 
 #include <botan/mceliece_key.h>
 
diff --git a/src/lib/pubkey/mce/gf2m_rootfind_dcmp.h b/src/lib/pubkey/mce/gf2m_rootfind_dcmp.h
index 8e1e1cd75..79874fe7e 100644
--- a/src/lib/pubkey/mce/gf2m_rootfind_dcmp.h
+++ b/src/lib/pubkey/mce/gf2m_rootfind_dcmp.h
@@ -1,24 +1,24 @@
 /**
- *
  * (C) 2014 cryptosource GmbH
  * (C) 2014 Falko Strenzke [email protected]
  *
  * Distributed under the terms of the Botan license
- *
  */
 
-#ifndef __gf2m_rootfind_dcmp__H_
-#define __gf2m_rootfind_dcmp__H_
+#ifndef BOTAN_GF2M_ROOTFIND_DCMP_H__
+#define BOTAN_GF2M_ROOTFIND_DCMP_H__
 
 #include <botan/polyn_gf2m.h>
-namespace Botan
-{
-  /**
-   * Find the roots of a polynomial over GF(2^m) using the method by Federenko
-   * et al.
-   */
-  secure_vector<gf2m> find_roots_gf2m_decomp(const polyn_gf2m & polyn, u32bit code_length);
 
-} // end namespace Botan
+namespace Botan {
+
+/**
+* Find the roots of a polynomial over GF(2^m) using the method by Federenko
+* et al.
+*/
+secure_vector<gf2m> find_roots_gf2m_decomp(const polyn_gf2m & polyn,
+                                           u32bit code_length);
+
+}
 
-#endif /* h-guard */
+#endif
diff --git a/src/lib/pubkey/mce/goppa_code.h b/src/lib/pubkey/mce/goppa_code.h
index 1c8a163b7..463a2eb72 100644
--- a/src/lib/pubkey/mce/goppa_code.h
+++ b/src/lib/pubkey/mce/goppa_code.h
@@ -9,24 +9,24 @@
  *
  */
 
-#ifndef __goppa_code__H_
-#define __goppa_code__H_
+#ifndef BOTAN_MCE_GOPPA_CODE_H__
+#define BOTAN_MCE_GOPPA_CODE_H__
 
 #include <botan/polyn_gf2m.h>
 #include <botan/mceliece_key.h>
 
+namespace Botan {
 
+std::vector<byte> mceliece_encrypt(const secure_vector<byte>& cleartext,
+                                   const std::vector<byte>& public_matrix,
+                                   const secure_vector<gf2m> & err_pos,
+                                   u32bit code_length);
 
-namespace Botan
-{
+secure_vector<byte> mceliece_decrypt(secure_vector<gf2m> & error_pos,
+                                     const byte *ciphertext,
+                                     u32bit ciphertext_len,
+                                     const McEliece_PrivateKey& key);
 
-  std::vector<byte> mceliece_encrypt( const secure_vector<byte> & cleartext, std::vector<byte> const& public_matrix, const secure_vector<gf2m> & err_pos, u32bit code_length);
+}
 
-
-secure_vector<byte> mceliece_decrypt(
-    secure_vector<gf2m> & error_pos,
-    const byte *ciphertext, u32bit ciphertext_len,
-    const McEliece_PrivateKey & key);
-} //end namepace Botan
-
-#endif /* h-guard */
+#endif
diff --git a/src/lib/pubkey/mce/mceliece_key.h b/src/lib/pubkey/mce/mceliece_key.h
index 1a9a699f4..cb9412c05 100644
--- a/src/lib/pubkey/mce/mceliece_key.h
+++ b/src/lib/pubkey/mce/mceliece_key.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef BOTAN_MCELIECE_KEY_H_
-#define BOTAN_MCELIECE_KEY_H_
+#ifndef BOTAN_MCELIECE_KEY_H__
+#define BOTAN_MCELIECE_KEY_H__
 
 #include <botan/exceptn.h>
 #include <botan/pk_keys.h>