ITS#8294 more for prev commit

diff --git a/contrib/slapd-modules/passwd/sha2/sha2.c b/contrib/slapd-modules/passwd/sha2/sha2.c
index 0d2ba5708e64d6eba0d6e2fd4cd0e0bd813b33e3..808da10becd15eda2f03709f201c8ff8ac75f63b 100644 (file)
--- a/contrib/slapd-modules/passwd/sha2/sha2.c
+++ b/contrib/slapd-modules/passwd/sha2/sha2.c
@@ -220,9 +220,9 @@ typedef u_int64_t sha2_word64;      /* Exactly 8 bytes */
  * library -- they are intended for private internal visibility/use
  * only.
  */
-void SHA512_Last(SHA512_CTX*);
-void SHA256_Transform(SHA256_CTX*, const sha2_word32*);
-void SHA512_Transform(SHA512_CTX*, const sha2_word64*);
+static void SHA512_Last(SHA512_CTX*);
+static void SHA256_Transform(SHA256_CTX*, const sha2_word32*);
+static void SHA512_Transform(SHA512_CTX*, const sha2_word64*);
 
 
 /*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/

diff --git a/contrib/slapd-modules/passwd/sha2/sha2.h b/contrib/slapd-modules/passwd/sha2/sha2.h
index 008c70b339afcdc3ccff0393e6fbc11a221fb324..7fff14231fb9e270fc773ccbe5056bf0f10312d3 100644 (file)
--- a/contrib/slapd-modules/passwd/sha2/sha2.h
+++ b/contrib/slapd-modules/passwd/sha2/sha2.h
@@ -144,6 +144,7 @@ typedef SHA512_CTX SHA384_CTX;
 
 
 /*** SHA-256/384/512 Function Prototypes ******************************/
+/* avoid symbol clash with other crypto libs */
 #define SHA256_Init            pw_SHA256_Init
 #define SHA256_Update  pw_SHA256_Update
 #define SHA256_Final   pw_SHA256_Final