Make TLS write functions' buffer arguments pointers const

petere · petere · commit a9258629edab · 2025-02-09T12:43:30.000+01:00
This also makes it match the equivalent APIs in libpq. Author: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org> Discussion: https://www.postgresql.org/message-id/flat/fd1fcedb-3492-4fc8-9e3e-74b97f2db6c7%40eisentraut.org
diff --git a/src/backend/libpq/be-secure-gssapi.c b/src/backend/libpq/be-secure-gssapi.c
@@ -93,7 +93,7 @@ static uint32 PqGSSMaxPktSize;	/* Maximum size we can encrypt and fit the
  * failure if necessary, and then return an errno indicating connection loss.
  */
 ssize_t
-be_gssapi_write(Port *port, void *ptr, size_t len)
+be_gssapi_write(Port *port, const void *ptr, size_t len)
 {
 	OM_uint32	major,
 				minor;
diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c
@@ -821,7 +821,7 @@ be_tls_read(Port *port, void *ptr, size_t len, int *waitfor)
 }
 
 ssize_t
-be_tls_write(Port *port, void *ptr, size_t len, int *waitfor)
+be_tls_write(Port *port, const void *ptr, size_t len, int *waitfor)
 {
 	ssize_t		n;
 	int			err;
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
@@ -302,7 +302,7 @@ secure_raw_read(Port *port, void *ptr, size_t len)
  *	Write data to a secure connection.
  */
 ssize_t
-secure_write(Port *port, void *ptr, size_t len)
+secure_write(Port *port, const void *ptr, size_t len)
 {
 	ssize_t		n;
 	int			waitfor;
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
@@ -1368,7 +1368,7 @@ internal_flush_buffer(const char *buf, size_t *start, size_t *end)
 	{
 		int			r;
 
-		r = secure_write(MyProcPort, (char *) bufptr, bufend - bufptr);
+		r = secure_write(MyProcPort, bufptr, bufend - bufptr);
 
 		if (r <= 0)
 		{
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
@@ -312,7 +312,7 @@ extern ssize_t be_tls_read(Port *port, void *ptr, size_t len, int *waitfor);
 /*
  * Write data to a secure connection.
  */
-extern ssize_t be_tls_write(Port *port, void *ptr, size_t len, int *waitfor);
+extern ssize_t be_tls_write(Port *port, const void *ptr, size_t len, int *waitfor);
 
 /*
  * Return information about the SSL connection.
@@ -352,7 +352,7 @@ extern bool be_gssapi_get_delegation(Port *port);
 
 /* Read and write to a GSSAPI-encrypted connection. */
 extern ssize_t be_gssapi_read(Port *port, void *ptr, size_t len);
-extern ssize_t be_gssapi_write(Port *port, void *ptr, size_t len);
+extern ssize_t be_gssapi_write(Port *port, const void *ptr, size_t len);
 #endif							/* ENABLE_GSS */
 
 extern PGDLLIMPORT ProtocolVersion FrontendProtocol;
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h
@@ -92,7 +92,7 @@ extern void secure_destroy(void);
 extern int	secure_open_server(Port *port);
 extern void secure_close(Port *port);
 extern ssize_t secure_read(Port *port, void *ptr, size_t len);
-extern ssize_t secure_write(Port *port, void *ptr, size_t len);
+extern ssize_t secure_write(Port *port, const void *ptr, size_t len);
 extern ssize_t secure_raw_read(Port *port, void *ptr, size_t len);
 extern ssize_t secure_raw_write(Port *port, const void *ptr, size_t len);
 

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ static uint32 PqGSSMaxPktSize; /* Maximum size we can encrypt and fit the`
`93`	`93`	`* failure if necessary, and then return an errno indicating connection loss.`
`94`	`94`	`*/`
`95`	`95`	`ssize_t`
`96`		`-be_gssapi_write(Port port, void ptr, size_t len)`
	`96`	`+be_gssapi_write(Port port, const void ptr, size_t len)`
`97`	`97`	`{`
`98`	`98`	`OM_uint32 major,`
`99`	`99`	`minor;`
Original file line number	Diff line number	Diff line change
`@@ -821,7 +821,7 @@ be_tls_read(Port port, void ptr, size_t len, int *waitfor)`
`821`	`821`	`}`
`822`	`822`
`823`	`823`	`ssize_t`
`824`		`-be_tls_write(Port port, void ptr, size_t len, int *waitfor)`
	`824`	`+be_tls_write(Port port, const void ptr, size_t len, int *waitfor)`
`825`	`825`	`{`
`826`	`826`	`ssize_t n;`
`827`	`827`	`int err;`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ secure_raw_read(Port port, void ptr, size_t len)`
`302`	`302`	`* Write data to a secure connection.`
`303`	`303`	`*/`
`304`	`304`	`ssize_t`
`305`		`-secure_write(Port port, void ptr, size_t len)`
	`305`	`+secure_write(Port port, const void ptr, size_t len)`
`306`	`306`	`{`
`307`	`307`	`ssize_t n;`
`308`	`308`	`int waitfor;`
Original file line number	Diff line number	Diff line change
`@@ -1368,7 +1368,7 @@ internal_flush_buffer(const char buf, size_t start, size_t *end)`
`1368`	`1368`	`{`
`1369`	`1369`	`int r;`
`1370`	`1370`
`1371`		`- r = secure_write(MyProcPort, (char *) bufptr, bufend - bufptr);`
	`1371`	`+ r = secure_write(MyProcPort, bufptr, bufend - bufptr);`
`1372`	`1372`
`1373`	`1373`	`if (r <= 0)`
`1374`	`1374`	`{`