Commit 0848cf4f authored by Tom Lane's avatar Tom Lane

Really fix the dummy implementations in cipher.c.

945083b2 wasn't enough to silence compiler warnings.
parent 8e59813e
...@@ -21,10 +21,12 @@ ...@@ -21,10 +21,12 @@
static void cipher_failure(void) pg_attribute_noreturn(); static void cipher_failure(void) pg_attribute_noreturn();
PgCipherCtx * PgCipherCtx *
pg_cipher_ctx_create(int cipher, uint8 *key, int klen, bool enc) pg_cipher_ctx_create(int cipher, uint8 *key, int klen, bool enc)
{ {
cipher_failure(); cipher_failure();
return NULL; /* keep compiler quiet */
} }
void void
...@@ -40,6 +42,7 @@ pg_cipher_encrypt(PgCipherCtx *ctx, const unsigned char *plaintext, ...@@ -40,6 +42,7 @@ pg_cipher_encrypt(PgCipherCtx *ctx, const unsigned char *plaintext,
unsigned char *outtag, const int taglen) unsigned char *outtag, const int taglen)
{ {
cipher_failure(); cipher_failure();
return false; /* keep compiler quiet */
} }
bool bool
...@@ -49,6 +52,7 @@ pg_cipher_decrypt(PgCipherCtx *ctx, const unsigned char *ciphertext, ...@@ -49,6 +52,7 @@ pg_cipher_decrypt(PgCipherCtx *ctx, const unsigned char *ciphertext,
unsigned char *intag, const int taglen) unsigned char *intag, const int taglen)
{ {
cipher_failure(); cipher_failure();
return false; /* keep compiler quiet */
} }
static void static void
...@@ -56,12 +60,11 @@ cipher_failure(void) ...@@ -56,12 +60,11 @@ cipher_failure(void)
{ {
#ifndef FRONTEND #ifndef FRONTEND
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_CONFIG_FILE_ERROR), (errcode(ERRCODE_CONFIG_FILE_ERROR),
(errmsg("cluster file encryption is not supported because OpenSSL is not supported by this build"), (errmsg("cluster file encryption is not supported because OpenSSL is not supported by this build"),
errhint("Compile with --with-openssl to use this feature.")))); errhint("Compile with --with-openssl to use this feature."))));
#else #else
fprintf(stderr, _("cluster file encryption is not supported because OpenSSL is not supported by this build")); fprintf(stderr, _("cluster file encryption is not supported because OpenSSL is not supported by this build"));
exit(1); exit(1);
#endif #endif
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment