Upstream-Status: Backport

Index: gnutls-1.6.0/libextra/gnutls_openssl.c
===================================================================
--- gnutls-1.6.0.orig/libextra/gnutls_openssl.c	2006-08-13 22:34:09.000000000 +0200
+++ gnutls-1.6.0/libextra/gnutls_openssl.c	2006-12-12 15:07:59.002227000 +0100
@@ -256,12 +256,17 @@
   ssl->rfd = (gnutls_transport_ptr_t) - 1;
   ssl->wfd = (gnutls_transport_ptr_t) - 1;
 
+  ssl->ssl_peek_buffer = NULL;
+  ssl->ssl_peek_buffer_size = ssl->ssl_peek_avail = 0;
+
   return ssl;
 }
 
 void
 SSL_free (SSL * ssl)
 {
+  if (ssl->ssl_peek_buffer)
+    free(ssl->ssl_peek_buffer);
   gnutls_certificate_free_credentials (ssl->gnutls_cred);
   gnutls_deinit (ssl->gnutls_state);
   free (ssl);
@@ -285,6 +290,7 @@
 SSL_set_fd (SSL * ssl, int fd)
 {
   gnutls_transport_set_ptr (ssl->gnutls_state, GNUTLS_INT_TO_POINTER (fd));
+  ssl->rfd = ssl->wfd = fd;
   return 1;
 }
 
@@ -310,6 +316,17 @@
   return 1;
 }
 
+int SSL_get_rfd(SSL *ssl)
+{
+  return ssl->rfd;
+}
+
+int SSL_get_wfd(SSL *ssl)
+{
+  return ssl->wfd;
+}
+
+
 void
 SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio)
 {
@@ -325,6 +342,8 @@
 int
 SSL_pending (SSL * ssl)
 {
+  if (ssl->ssl_peek_avail)
+    return ssl->ssl_peek_avail;
   return gnutls_record_check_pending (ssl->gnutls_state);
 }
 
@@ -480,11 +499,50 @@
   return 1;
 }
 
+int SSL_peek(SSL *ssl, void *buf, int len)
+{
+  if (len > ssl->ssl_peek_buffer_size) {
+    ssl->ssl_peek_buffer = realloc (ssl->ssl_peek_buffer, len);
+    ssl->ssl_peek_buffer_size = len;
+  }
+
+  if (ssl->ssl_peek_avail == 0) {
+
+    int ret;
+    
+    ret = gnutls_record_recv(ssl->gnutls_state, ssl->ssl_peek_buffer, len);
+    ssl->last_error = ret;
+    
+    if (ret > 0)
+      ssl->ssl_peek_avail += ret;
+  }
+
+  if (len > ssl->ssl_peek_avail)
+    len = ssl->ssl_peek_avail;
+
+  memcpy (buf, ssl->ssl_peek_buffer, len);
+
+  return len;
+}
+
 int
 SSL_read (SSL * ssl, void *buf, int len)
 {
   int ret;
 
+  if (ssl->ssl_peek_avail) {
+    int n = (ssl->ssl_peek_avail > len) ? len : ssl->ssl_peek_avail;
+
+    memcpy (buf, ssl->ssl_peek_buffer, n);
+
+    if (ssl->ssl_peek_avail > n)
+      memmove (ssl->ssl_peek_buffer, ssl->ssl_peek_buffer + n, ssl->ssl_peek_avail - n);
+
+    ssl->ssl_peek_avail -= n;
+
+    return n;
+  }
+
   ret = gnutls_record_recv (ssl->gnutls_state, buf, len);
   ssl->last_error = ret;
 
Index: gnutls-1.6.0/includes/gnutls/openssl.h
===================================================================
--- gnutls-1.6.0.orig/libextra/includes/gnutls/openssl.h	2006-03-08 11:44:58.000000000 +0100
+++ gnutls-1.6.0/libextra/includes/gnutls/openssl.h	2006-12-12 15:07:26.032227000 +0100
@@ -164,6 +164,11 @@
 
     gnutls_transport_ptr_t rfd;
     gnutls_transport_ptr_t wfd;
+
+    char *ssl_peek_buffer;
+    size_t ssl_peek_buffer_size;
+    size_t ssl_peek_avail;
+
   };
 
 #define rbio gnutls_state