Really fix the dummy implementations in cipher.c.

tglsfdc · tglsfdc · commit 0848cf4f553b · 2020-12-25T14:45:24.000-05:00
945083b wasn't enough to silence compiler warnings.
diff --git 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,19 +52,19 @@ pg_cipher_decrypt(PgCipherCtx *ctx, const unsigned char *ciphertext,
 				  unsigned char *intag, const int taglen)
 {
 	cipher_failure();
+	return false;				/* keep compiler quiet */
 }
 
 static void
 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
-}	
-
+}

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,12 @@`
`21`	`21`
`22`	`22`	`static void cipher_failure(void) pg_attribute_noreturn();`
`23`	`23`
	`24`	`+`
`24`	`25`	`PgCipherCtx *`
`25`	`26`	`pg_cipher_ctx_create(int cipher, uint8 *key, int klen, bool enc)`
`26`	`27`	`{`
`27`	`28`	`cipher_failure();`
	`29`	`+ return NULL; /* keep compiler quiet */`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`void`
`@@ -40,6 +42,7 @@ pg_cipher_encrypt(PgCipherCtx ctx, const unsigned char plaintext,`
`40`	`42`	`unsigned char *outtag, const int taglen)`
`41`	`43`	`{`
`42`	`44`	`cipher_failure();`
	`45`	`+ return false; /* keep compiler quiet */`
`43`	`46`	`}`
`44`	`47`
`45`	`48`	`bool`
`@@ -49,19 +52,19 @@ pg_cipher_decrypt(PgCipherCtx ctx, const unsigned char ciphertext,`
`49`	`52`	`unsigned char *intag, const int taglen)`
`50`	`53`	`{`
`51`	`54`	`cipher_failure();`
	`55`	`+ return false; /* keep compiler quiet */`
`52`	`56`	`}`
`53`	`57`
`54`	`58`	`static void`
`55`	`59`	`cipher_failure(void)`
`56`	`60`	`{`
`57`	`61`	`#ifndef FRONTEND`
`58`	`62`	`ereport(ERROR,`
`59`		`- (errcode(ERRCODE_CONFIG_FILE_ERROR),`
`60`		`- (errmsg("cluster file encryption is not supported because OpenSSL is not supported by this build"),`
`61`		`- errhint("Compile with --with-openssl to use this feature."))));`
	`63`	`+ (errcode(ERRCODE_CONFIG_FILE_ERROR),`
	`64`	`+ (errmsg("cluster file encryption is not supported because OpenSSL is not supported by this build"),`
	`65`	`+ errhint("Compile with --with-openssl to use this feature."))));`
`62`	`66`	`#else`
`63`	`67`	`fprintf(stderr, _("cluster file encryption is not supported because OpenSSL is not supported by this build"));`
`64`	`68`	`exit(1);`
`65`	`69`	`#endif`
`66`		`-}`
`67`		`-`
	`70`	`+}`