diff options
| author | Michael Paquier <michael@paquier.xyz> | 2019-06-14 09:00:36 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2019-06-14 09:00:36 +0900 |
| commit | 96719e52b1abd3a8c712d06a809b7e6c97c2e3a0 (patch) | |
| tree | 26b4a5f0d7571c24e5d49a2ff82ea77c85be9ccb | |
| parent | d25ea0127598dd0ad27a029215172f396fbd1009 (diff) | |
| download | postgresql-96719e52b1abd3a8c712d06a809b7e6c97c2e3a0.tar.gz postgresql-96719e52b1abd3a8c712d06a809b7e6c97c2e3a0.zip | |
Use OpenSSL-specific ifdefs in sha2.h
In order to separate OpenSSL's SHA symbols, this header has been using
USE_SSL, which is equivalent to USE_OPENSSL. There is now only one SSL
implementation included in the tree, so this works fine, but when
adding a new SSL implementation this would run into failures.
Author: Daniel Gustafsson
Discussion: https://postgr.es/m/0DF29010-CE26-4F51-85A6-9C8ABF5536F9@yesql.se
| -rw-r--r-- | src/include/common/sha2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/include/common/sha2.h b/src/include/common/sha2.h index 830359f6453..cd3da8eccdc 100644 --- a/src/include/common/sha2.h +++ b/src/include/common/sha2.h @@ -50,7 +50,7 @@ #ifndef _PG_SHA2_H_ #define _PG_SHA2_H_ -#ifdef USE_SSL +#ifdef USE_OPENSSL #include <openssl/sha.h> #endif @@ -69,7 +69,7 @@ #define PG_SHA512_DIGEST_STRING_LENGTH (PG_SHA512_DIGEST_LENGTH * 2 + 1) /* Context Structures for SHA-1/224/256/384/512 */ -#ifdef USE_SSL +#ifdef USE_OPENSSL typedef SHA256_CTX pg_sha256_ctx; typedef SHA512_CTX pg_sha512_ctx; typedef SHA256_CTX pg_sha224_ctx; @@ -89,7 +89,7 @@ typedef struct pg_sha512_ctx } pg_sha512_ctx; typedef struct pg_sha256_ctx pg_sha224_ctx; typedef struct pg_sha512_ctx pg_sha384_ctx; -#endif /* USE_SSL */ +#endif /* USE_OPENSSL */ /* Interface routines for SHA224/256/384/512 */ extern void pg_sha224_init(pg_sha224_ctx *ctx); |