diff options
| author | Pavan Deolasee | 2015-05-05 09:19:18 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2015-05-05 09:19:18 +0000 |
| commit | 73fa25c67cbfa24c03e28c96bf356f2592671730 (patch) | |
| tree | 10ded7e26abd78d93658cb72fc5cb9d4672eff2a /contrib/pgcrypto/sha2.c | |
| parent | da4d108859bcd7a308ca75aba54281e32968822c (diff) | |
| parent | 4a9ab6d8619817f9e3989c99b65140e19041dab7 (diff) | |
Merge branch 'XL_MASTER_MERGE_9_4' into XL_NEW_MASTER
Conflicts:
src/test/regress/expected/aggregates.out
src/test/regress/expected/create_index.out
src/test/regress/expected/inherit.out
src/test/regress/expected/join.out
src/test/regress/expected/window.out
src/test/regress/expected/with.out
Diffstat (limited to 'contrib/pgcrypto/sha2.c')
| -rw-r--r-- | contrib/pgcrypto/sha2.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/pgcrypto/sha2.c b/contrib/pgcrypto/sha2.c index 5de94b2fcd..231f9dfbb0 100644 --- a/contrib/pgcrypto/sha2.c +++ b/contrib/pgcrypto/sha2.c @@ -22,7 +22,7 @@ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTOR(S) BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -40,6 +40,7 @@ #include <sys/param.h> +#include "px.h" #include "sha2.h" /* @@ -570,7 +571,7 @@ SHA256_Final(uint8 digest[], SHA256_CTX *context) } /* Clean up state data: */ - memset(context, 0, sizeof(*context)); + px_memset(context, 0, sizeof(*context)); } @@ -899,7 +900,7 @@ SHA512_Final(uint8 digest[], SHA512_CTX *context) } /* Zero out state data */ - memset(context, 0, sizeof(*context)); + px_memset(context, 0, sizeof(*context)); } @@ -944,7 +945,7 @@ SHA384_Final(uint8 digest[], SHA384_CTX *context) } /* Zero out state data */ - memset(context, 0, sizeof(*context)); + px_memset(context, 0, sizeof(*context)); } /*** SHA-224: *********************************************************/ @@ -987,5 +988,5 @@ SHA224_Final(uint8 digest[], SHA224_CTX *context) } /* Clean up state data: */ - memset(context, 0, sizeof(*context)); + px_memset(context, 0, sizeof(*context)); } |