Changeset 80acb6d for lib/ssl_gnutls.c

Timestamp:

2011-11-14T10:43:03Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5dd725d

Parents:

03a8f8e

Message:

GnuTLS now also needs ssl_pending() implemented. Bug #860.

File:

• lib/ssl_gnutls.c (modified) (4 diffs)

lib/ssl_gnutls.c

@@ -135 +135 @@
         gnutls_certificate_allocate_credentials( &conn->xcred );
         gnutls_init( &conn->session, GNUTLS_CLIENT );
-        gnutls_transport_set_lowat( conn->session, 1 ); 
+#if GNUTLS_VERSION_NUMBER < 0x020c00
+        gnutls_transport_set_lowat( conn->session, 0 );
+#endif
         gnutls_set_default_priority( conn->session );
         gnutls_credentials_set( conn->session, GNUTLS_CRD_CERTIFICATE, conn->xcred );
@@ -187 +189 @@
         {
                 ssl_errno = SSL_NOHANDSHAKE;
-                return( -1 );
+                return -1;
         }
         
@@ -208 +210 @@
         {
                 ssl_errno = SSL_NOHANDSHAKE;
-                return( -1 );
+                return -1;
         }
         
@@ -222 +224 @@
 }
 
-/* See ssl_openssl.c for an explanation. */
 int ssl_pending( void *conn )
 {
-        return 0;
+        if( conn == NULL )
+                return 0;
+        
+        if( !((struct scd*)conn)->established )
+        {
+                ssl_errno = SSL_NOHANDSHAKE;
+                return 0;
+        }
+        
+        return gnutls_record_check_pending( ((struct scd*)conn)->session ) != 0;
 }