Commit482ed83

committed

Check SSL_get_error() value SSL_ERROR_SYSCALL to see if SSL_read()

returned -1, per SSL_get_error() documentation.Nathan Mueller

1 parent5587f07 commit482ed83Copy full SHA for 482ed83

File tree

+14

-6

lines changed

+14

-6

lines changed

Lines changed: 9 additions & 3 deletions

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.16 2002/11/07 18:45:51 tgl Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.17 2002/12/12 22:42:39 momjian 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`
`@@ -288,7 +288,10 @@ secure_read(Port port, void ptr, size_t len)`
`288`	`288`	`caseSSL_ERROR_WANT_READ:`
`289`	`289`	`break;`
`290`	`290`	`caseSSL_ERROR_SYSCALL:`
`291`		`-elog(ERROR,"SSL SYSCALL error: %s",strerror(errno));`
	`291`	`+if (n==-1)`
	`292`	`+elog(ERROR,"SSL SYSCALL error: %s",strerror(errno));`
	`293`	`+else`
	`294`	`+strerror(errno));`
`292`	`295`	`break;`
`293`	`296`	`caseSSL_ERROR_SSL:`
`294`	`297`	`elog(ERROR,"SSL error: %s",SSLerrmessage());`
`@@ -337,7 +340,10 @@ secure_write(Port port, const void ptr, size_t len)`
`337`	`340`	`caseSSL_ERROR_WANT_WRITE:`
`338`	`341`	`break;`
`339`	`342`	`caseSSL_ERROR_SYSCALL:`
`340`		`-elog(ERROR,"SSL SYSCALL error: %s",strerror(errno));`
	`343`	`+if (n==-1)`
	`344`	`+elog(ERROR,"SSL SYSCALL error: %s",strerror(errno));`
	`345`	`+else`
	`346`	`+strerror(errno));`
`341`	`347`	`break;`
`342`	`348`	`caseSSL_ERROR_SSL:`
`343`	`349`	`elog(ERROR,"SSL error: %s",SSLerrmessage());`

Lines changed: 5 additions & 3 deletions

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/interfaces/libpq/fe-secure.c,v 1.16 2002/11/07 18:45:51 tgl Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-secure.c,v 1.17 2002/12/12 22:42:39 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`* NOTES`
`17`	`17`	`* The client requires a valid server certificate. Since`
`@@ -270,7 +270,8 @@ pqsecure_read(PGconn conn, void ptr, size_t len)`
`270`	`270`	`caseSSL_ERROR_WANT_READ:`
`271`	`271`	`break;`
`272`	`272`	`caseSSL_ERROR_SYSCALL:`
`273`		`-printfPQExpBuffer(&conn->errorMessage,`
	`273`	`+if (n==-1)`
	`274`	`+printfPQExpBuffer(&conn->errorMessage,`
`274`	`275`	`libpq_gettext("SSL SYSCALL error: %s\n"),`
`275`	`276`	`SOCK_STRERROR(SOCK_ERRNO));`
`276`	`277`	`break;`
`@@ -315,7 +316,8 @@ pqsecure_write(PGconn conn, const void ptr, size_t len)`
`315`	`316`	`caseSSL_ERROR_WANT_WRITE:`
`316`	`317`	`break;`
`317`	`318`	`caseSSL_ERROR_SYSCALL:`
`318`		`-printfPQExpBuffer(&conn->errorMessage,`
	`319`	`+if (n==-1)`
	`320`	`+printfPQExpBuffer(&conn->errorMessage,`
`319`	`321`	`libpq_gettext("SSL SYSCALL error: %s\n"),`
`320`	`322`	`SOCK_STRERROR(SOCK_ERRNO));`
`321`	`323`	`break;`

Comments

(0)