Consistent #include guards

src/libsodium/crypto_pwhash/argon2/argon2-core.h

@@ -11,8 +11,8 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-#ifndef ARGON2_CORE_H
-#define ARGON2_CORE_H
+#ifndef argon2_core_H
+#define argon2_core_H
 
 #include "argon2.h"
 

src/libsodium/crypto_pwhash/argon2/argon2-encoding.h

@@ -1,5 +1,6 @@
-#ifndef ENCODING_H
-#define ENCODING_H
+#ifndef argon2_encoding_H
+#define argon2_encoding_H
+
 #include "argon2.h"
 
 int encode_string(char *dst, size_t dst_len, argon2_context *ctx,

src/libsodium/crypto_pwhash/argon2/argon2-impl.h

@@ -11,8 +11,8 @@
    this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 */
 
-#ifndef blake2_impl_H
-#define blake2_impl_H
+#ifndef argon2_impl_H
+#define argon2_impl_H
 
 #include <stdint.h>
 #include <string.h>

src/libsodium/crypto_pwhash/argon2/argon2.h

@@ -10,8 +10,8 @@
  * this software. If not, see
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
-#ifndef ARGON2_H
-#define ARGON2_H
+#ifndef argon2_H
+#define argon2_H
 
 #include <stdint.h>
 #include <stddef.h>

src/libsodium/crypto_pwhash/argon2/blake2b-long.h

@@ -1,5 +1,5 @@
-#ifndef blake2_long_H
-#define blake2_long_H
+#ifndef blake2b_long_H
+#define blake2b_long_H
 
 #include <stddef.h>
 

src/libsodium/crypto_pwhash/argon2/blamka-round-ref.h

@@ -1,5 +1,5 @@
-#ifndef BLAKE_ROUND_MKA_H
-#define BLAKE_ROUND_MKA_H
+#ifndef blamka_round_ref_H
+#define blamka_round_ref_H
 
 #include "argon2-impl.h"
 

src/libsodium/crypto_pwhash/argon2/blamka-round-ssse3.h

@@ -1,5 +1,5 @@
-#ifndef BLAKE_ROUND_MKA_OPT_SSSE3_H
-#define BLAKE_ROUND_MKA_OPT_SSSE3_H
+#ifndef blamka_round_ssse3_H
+#define blamka_round_ssse3_H
 
 #include "argon2-impl.h"