const-ify info_cb() to match recent openssl releases. Per Joe Conway.

tglsfdc · tglsfdc · commit 3831636645eb · 2003-04-25T04:37:23.000Z
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.30 2003/04/19 00:02:29 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.31 2003/04/25 04:37:23 tgl Exp $
  *
  *	  Since the server static private key ($DataDir/server.key)
  *	  will normally be stored unencrypted so that the database
@@ -115,7 +115,7 @@ static DH  *load_dh_file(int keylength);
 static DH  *load_dh_buffer(const char *, size_t);
 static DH  *tmp_dh_cb(SSL *s, int is_export, int keylength);
 static int	verify_cb(int, X509_STORE_CTX *);
-static void info_cb(SSL *ssl, int type, int args);
+static void info_cb(const SSL *ssl, int type, int args);
 static int	initialize_SSL(void);
 static void destroy_SSL(void);
 static int	open_server_SSL(Port *);
@@ -547,7 +547,7 @@ verify_cb(int ok, X509_STORE_CTX *ctx)
  *	into the PostgreSQL log.
  */
 static void
-info_cb(SSL *ssl, int type, int args)
+info_cb(const SSL *ssl, int type, int args)
 {
 	switch (type)
 	{

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.30 2003/04/19 00:02:29 tgl Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.31 2003/04/25 04:37:23 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* Since the server static private key ($DataDir/server.key)`
`17`	`17`	`* will normally be stored unencrypted so that the database`
`@@ -115,7 +115,7 @@ static DH *load_dh_file(int keylength);`
`115`	`115`	`static DH load_dh_buffer(const char , size_t);`
`116`	`116`	`static DH tmp_dh_cb(SSL s, int is_export, int keylength);`
`117`	`117`	`static int verify_cb(int, X509_STORE_CTX *);`
`118`		`-static void info_cb(SSL *ssl, int type, int args);`
	`118`	`+static void info_cb(const SSL *ssl, int type, int args);`
`119`	`119`	`static int initialize_SSL(void);`
`120`	`120`	`static void destroy_SSL(void);`
`121`	`121`	`static int open_server_SSL(Port *);`
`@@ -547,7 +547,7 @@ verify_cb(int ok, X509_STORE_CTX *ctx)`
`547`	`547`	`* into the PostgreSQL log.`
`548`	`548`	`*/`
`549`	`549`	`static void`
`550`		`-info_cb(SSL *ssl, int type, int args)`
	`550`	`+info_cb(const SSL *ssl, int type, int args)`
`551`	`551`	`{`
`552`	`552`	`switch (type)`
`553`	`553`	`{`