summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2020-12-25 14:44:17 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2020-12-25 14:45:24 -0500
commit0848cf4f553bda5a9f044c56b3bec19929ee24e6 (patch)
tree01cd58299041260d70290005ca79325088ccf43a /src
parent8e59813e2287db90044537b1093c0869020ffa4a (diff)
downloadpostgresql-0848cf4f553bda5a9f044c56b3bec19929ee24e6.tar.gz
Really fix the dummy implementations in cipher.c.
945083b2f wasn't enough to silence compiler warnings.
Diffstat (limited to 'src')
-rw-r--r--src/common/cipher.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/common/cipher.c b/src/common/cipher.c
index 393b062bc3..483cb610a3 100644
--- a/src/common/cipher.c
+++ b/src/common/cipher.c
@@ -21,10 +21,12 @@
static void cipher_failure(void) pg_attribute_noreturn();
+
PgCipherCtx *
pg_cipher_ctx_create(int cipher, uint8 *key, int klen, bool enc)
{
cipher_failure();
+ return NULL; /* keep compiler quiet */
}
void
@@ -40,6 +42,7 @@ pg_cipher_encrypt(PgCipherCtx *ctx, const unsigned char *plaintext,
unsigned char *outtag, const int taglen)
{
cipher_failure();
+ return false; /* keep compiler quiet */
}
bool
@@ -49,6 +52,7 @@ pg_cipher_decrypt(PgCipherCtx *ctx, const unsigned char *ciphertext,
unsigned char *intag, const int taglen)
{
cipher_failure();
+ return false; /* keep compiler quiet */
}
static void
@@ -56,12 +60,11 @@ cipher_failure(void)
{
#ifndef FRONTEND
ereport(ERROR,
- (errcode(ERRCODE_CONFIG_FILE_ERROR),
- (errmsg("cluster file encryption is not supported because OpenSSL is not supported by this build"),
- errhint("Compile with --with-openssl to use this feature."))));
+ (errcode(ERRCODE_CONFIG_FILE_ERROR),
+ (errmsg("cluster file encryption is not supported because OpenSSL is not supported by this build"),
+ errhint("Compile with --with-openssl to use this feature."))));
#else
fprintf(stderr, _("cluster file encryption is not supported because OpenSSL is not supported by this build"));
exit(1);
#endif
-}
-
+}