From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 25 Dec 2020 16:00:32 +0000 (-0500)
Subject: Fix return value and const declaration from commit 978f869b99
X-Git-Tag: REL_14_BETA1~1085
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=945083b2f7e6c19c8921c655cac6778acb1e3e03;p=postgresql.git

Fix return value and const declaration from commit 978f869b99

This fixes the non-OpenSSL compile case.

Reported-by: buildfarm member sifaka

Backpatch-through: master
---

diff --git a/src/common/cipher.c b/src/common/cipher.c
index e42d9844492..a05d8b63239 100644
--- a/src/common/cipher.c
+++ b/src/common/cipher.c
@@ -19,7 +19,7 @@
 
 #include "common/cipher.h"
 
-static cipher_failure(void);
+static void cipher_failure(void);
 
 PgCipherCtx *
 pg_cipher_ctx_create(int cipher, uint8 *key, int klen, bool enc)
@@ -46,12 +46,12 @@ bool
 pg_cipher_decrypt(PgCipherCtx *ctx, const unsigned char *ciphertext,
 				  const int inlen, unsigned char *plaintext, int *outlen,
 				  const unsigned char *iv, const int ivlen,
-				  const unsigned char *intag, const int taglen)
+				  unsigned char *intag, const int taglen)
 {
 	cipher_failure();
 }
 
-static
+static void
 cipher_failure(void)
 {
 #ifndef FRONTEND