Merge remote-tracking branch 'me/ch/SSL_read' into 3.1

azat · azat · commit 84b61a6befbf · 2024-07-01T17:04:07.000+02:00
* me/ch/SSL_read:
  Partial fix for MDEV-27405:
diff --git a/libmariadb/secure/openssl.c b/libmariadb/secure/openssl.c
@@ -726,7 +726,7 @@ ssize_t ma_tls_read(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
   int rc;
   MARIADB_PVIO *pvio= ctls->pvio;
 
-  while ((rc= SSL_read((SSL *)ctls->ssl, (void *)buffer, (int)length)) < 0)
+  while ((rc= SSL_read((SSL *)ctls->ssl, (void *)buffer, (int)length)) <= 0)
   {
     int error= SSL_get_error((SSL *)ctls->ssl, rc);
     if (error != SSL_ERROR_WANT_READ)

Original file line number	Diff line number	Diff line change
`@@ -726,7 +726,7 @@ ssize_t ma_tls_read(MARIADB_TLS ctls, const uchar buffer, size_t length)`
`726`	`726`	`int rc;`
`727`	`727`	`MARIADB_PVIO *pvio= ctls->pvio;`
`728`	`728`
`729`		`- while ((rc= SSL_read((SSL )ctls->ssl, (void )buffer, (int)length)) < 0)`
	`729`	`+ while ((rc= SSL_read((SSL )ctls->ssl, (void )buffer, (int)length)) <= 0)`
`730`	`730`	`{`
`731`	`731`	`int error= SSL_get_error((SSL *)ctls->ssl, rc);`
`732`	`732`	`if (error != SSL_ERROR_WANT_READ)`