mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Really fix the dummy implementations in cipher.c.

Browse Source 
945083b2f wasn't enough to silence compiler warnings.
This commit is contained in:
Tom Lane 2020-12-25 14:44:17 -05:00
parent 8e59813e22
commit 0848cf4f55
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/cipher.c
View File

@ -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,
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,
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)
{ {
#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
} }