Copy and paste error... bn_add_part_words() should of course call

[openssl.git] / ssl / s2_pkt.c

diff --git a/ssl/s2_pkt.c b/ssl/s2_pkt.c
index 73c96f3c3618e81f98bfd09be8469c8fbf5ef83d..0b48ea28948bf66d9b0e1e7cb674ff5e2a56f113 100644 (file)
--- a/ssl/s2_pkt.c
+++ b/ssl/s2_pkt.c
@@ -56,10 +56,11 @@
  * [including the GNU Public Licence.]
  */
 
+#include "ssl_locl.h"
+#ifndef NO_SSL2
 #include <stdio.h>
 #include <errno.h>
 #define USE_SOCKETS
-#include "ssl_locl.h"
 
 static int read_n(SSL *s,unsigned int n,unsigned int max,unsigned int extend);
 static int do_ssl_write(SSL *s, const unsigned char *buf, unsigned int len);
@@ -67,6 +68,10 @@ static int write_pending(SSL *s, const unsigned char *buf, unsigned int len);
 static int ssl_mt_error(int n);
 int ssl2_peek(SSL *s, char *buf, int len)
        {
+#if 1
+       SSLerr(SSL_F_SSL2_PEEK, SSL_R_FIXME); /* function is totally broken */
+       return -1;
+#else
        int ret;
 
        ret=ssl2_read(s,buf,len);
@@ -76,6 +81,7 @@ int ssl2_peek(SSL *s, char *buf, int len)
                s->s2->ract_data-=ret;
                }
        return(ret);
+#endif
        }
 
 /* SSL_read -
@@ -391,8 +397,12 @@ int ssl2_write(SSL *s, const void *_buf, int len)
                        s->s2->wnum=tot;
                        return(i);
                        }
-               if (i == (int)n) return(tot+i);
-
+               if ((i == (int)n) ||
+                       (s->mode & SSL_MODE_ENABLE_PARTIAL_WRITE))
+                       {
+                       return(tot+i);
+                       }
+               
                n-=i;
                tot+=i;
                }
@@ -406,7 +416,9 @@ static int write_pending(SSL *s, const unsigned char *buf, unsigned int len)
 
        /* check that they have given us the same buffer to
         * write */
-       if ((s->s2->wpend_tot > (int)len) || (s->s2->wpend_buf != buf))
+       if ((s->s2->wpend_tot > (int)len) ||
+               ((s->s2->wpend_buf != buf) &&
+                !(s->mode & SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER)))
                {
                SSLerr(SSL_F_WRITE_PENDING,SSL_R_BAD_WRITE_RETRY);
                return(-1);
@@ -632,3 +644,10 @@ static int ssl_mt_error(int n)
                }
        return(ret);
        }
+#else /* !NO_SSL2 */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
+#endif