From: Howard Chu Date: Thu, 29 Oct 2015 20:31:36 +0000 (+0000) Subject: ITS#8294 more for prev commit X-Git-Tag: OPENLDAP_REL_ENG_2_4_43~13 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;ds=sidebyside;h=8c68d8dc0e721eebbf679d6ed33229d1ce11fcdf;p=openldap 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 0d2ba5708e..808da10bec 100644 --- 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 008c70b339..7fff14231f 100644 --- 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