Fix return value and const declaration from commit 978f869

bmomjian · bmomjian · commit 945083b2f7e6 · 2020-12-25T11:00:32.000-05:00
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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`	`#include "common/cipher.h"`
`21`	`21`
`22`	`-static cipher_failure(void);`
	`22`	`+static void cipher_failure(void);`
`23`	`23`
`24`	`24`	`PgCipherCtx *`
`25`	`25`	`pg_cipher_ctx_create(int cipher, uint8 *key, int klen, bool enc)`
`@@ -46,12 +46,12 @@ bool`
`46`	`46`	`pg_cipher_decrypt(PgCipherCtx ctx, const unsigned char ciphertext,`
`47`	`47`	`const int inlen, unsigned char plaintext, int outlen,`
`48`	`48`	`const unsigned char *iv, const int ivlen,`
`49`		`- const unsigned char *intag, const int taglen)`
	`49`	`+ unsigned char *intag, const int taglen)`
`50`	`50`	`{`
`51`	`51`	`cipher_failure();`
`52`	`52`	`}`
`53`	`53`
`54`		`-static`
	`54`	`+static void`
`55`	`55`	`cipher_failure(void)`
`56`	`56`	`{`
`57`	`57`	`#ifndef FRONTEND`