diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/pgcrypto/sha2.c | 18 | ||||
| -rw-r--r-- | contrib/pgcrypto/sha2.h | 12 |
2 files changed, 20 insertions, 10 deletions
diff --git a/contrib/pgcrypto/sha2.c b/contrib/pgcrypto/sha2.c index 46f44679bd5..19febaa1199 100644 --- a/contrib/pgcrypto/sha2.c +++ b/contrib/pgcrypto/sha2.c @@ -33,7 +33,7 @@ * * $From: sha2.c,v 1.1 2001/11/08 00:01:51 adg Exp adg $ * - * $PostgreSQL: pgsql/contrib/pgcrypto/sha2.c,v 1.5 2005/10/15 02:49:06 momjian Exp $ + * $PostgreSQL: pgsql/contrib/pgcrypto/sha2.c,v 1.6 2006/05/30 12:56:45 momjian Exp $ */ #include "postgres.h" @@ -163,9 +163,9 @@ * library -- they are intended for private internal visibility/use * only. */ -void SHA512_Last(SHA512_CTX *); -void SHA256_Transform(SHA256_CTX *, const uint8 *); -void SHA512_Transform(SHA512_CTX *, const uint8 *); +static void SHA512_Last(SHA512_CTX *); +static void SHA256_Transform(SHA256_CTX *, const uint8 *); +static void SHA512_Transform(SHA512_CTX *, const uint8 *); /*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/ @@ -307,7 +307,7 @@ SHA256_Init(SHA256_CTX * context) j++; \ } while(0) -void +static void SHA256_Transform(SHA256_CTX * context, const uint8 *data) { uint32 a, @@ -378,7 +378,7 @@ SHA256_Transform(SHA256_CTX * context, const uint8 *data) } #else /* SHA2_UNROLL_TRANSFORM */ -void +static void SHA256_Transform(SHA256_CTX * context, const uint8 *data) { uint32 a, @@ -631,7 +631,7 @@ SHA512_Init(SHA512_CTX * context) j++; \ } while(0) -void +static void SHA512_Transform(SHA512_CTX * context, const uint8 *data) { uint64 a, @@ -699,7 +699,7 @@ SHA512_Transform(SHA512_CTX * context, const uint8 *data) } #else /* SHA2_UNROLL_TRANSFORM */ -void +static void SHA512_Transform(SHA512_CTX * context, const uint8 *data) { uint64 a, @@ -842,7 +842,7 @@ SHA512_Update(SHA512_CTX * context, const uint8 *data, size_t len) usedspace = freespace = 0; } -void +static void SHA512_Last(SHA512_CTX * context) { unsigned int usedspace; diff --git a/contrib/pgcrypto/sha2.h b/contrib/pgcrypto/sha2.h index 824bcefd29b..95f8a2400d7 100644 --- a/contrib/pgcrypto/sha2.h +++ b/contrib/pgcrypto/sha2.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pgcrypto/sha2.h,v 1.2 2005/10/15 02:49:06 momjian Exp $ */ +/* $PostgreSQL: pgsql/contrib/pgcrypto/sha2.h,v 1.3 2006/05/30 12:56:45 momjian Exp $ */ /* $OpenBSD: sha2.h,v 1.2 2004/04/28 23:11:57 millert Exp $ */ /* @@ -38,6 +38,16 @@ #ifndef _SHA2_H #define _SHA2_H +/* avoid conflict with OpenSSL */ +#define SHA256_Init pg_SHA256_Init +#define SHA256_Update pg_SHA256_Update +#define SHA256_Final pg_SHA256_Final +#define SHA384_Init pg_SHA384_Init +#define SHA384_Update pg_SHA384_Update +#define SHA384_Final pg_SHA384_Final +#define SHA512_Init pg_SHA512_Init +#define SHA512_Update pg_SHA512_Update +#define SHA512_Final pg_SHA512_Final /*** SHA-256/384/512 Various Length Definitions ***********************/ #define SHA256_BLOCK_LENGTH 64 |