OpenSSL 0.9.4 merge

1 files changed, 5 insertions, 8 deletions

diff --git a/src/lib/libssl/s23_pkt.c b/src/lib/libssl/s23_pkt.c
index c25c312772..8370ea508c 100644
--- a/src/lib/libssl/s23_pkt.c
+++ b/src/lib/libssl/s23_pkt.c
@@ -59,12 +59,11 @@
 #include <stdio.h>
 #include <errno.h>
 #define USE_SOCKETS
-#include "evp.h"
-#include "buffer.h"
+#include <openssl/evp.h>
+#include <openssl/buffer.h>
 #include "ssl_locl.h"
 
-int ssl23_write_bytes(s)
-SSL *s;
+int ssl23_write_bytes(SSL *s)
         {
         int i,num,tot;
         char *buf;
@@ -76,7 +75,7 @@ SSL *s;
                 {
                 s->rwstate=SSL_WRITING;
                 i=BIO_write(s->wbio,&(buf[tot]),num);
-                if (i < 0)
+                if (i <= 0)
                         {
                         s->init_off=tot;
                         s->init_num=num;
@@ -91,9 +90,7 @@ SSL *s;
         }
 
 /* only return when we have read 'n' bytes */
-int ssl23_read_bytes(s,n)
-SSL *s;
-int n;
+int ssl23_read_bytes(SSL *s, int n)
         {
         unsigned char *p;
         int j;