Add missing #ifndefs that caused missing symbols when building libssl

[openssl.git] / ssl / s2_pkt.c

diff --git a/ssl/s2_pkt.c b/ssl/s2_pkt.c
index 39d8010bdeccd24a5a25f5539462abf1cbad6130..56662f29facb508a10b908c2ffb87808fcd0485a 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);
@@ -392,7 +393,7 @@ int ssl2_write(SSL *s, const void *_buf, int len)
                        return(i);
                        }
                if ((i == (int)n) ||
-                       (s->mode | SSL_MODE_ENABLE_PARTIAL_WRITE))
+                       (s->mode & SSL_MODE_ENABLE_PARTIAL_WRITE))
                        {
                        return(tot+i);
                        }
@@ -412,7 +413,7 @@ static int write_pending(SSL *s, const unsigned char *buf, unsigned int len)
         * write */
        if ((s->s2->wpend_tot > (int)len) ||
                ((s->s2->wpend_buf != buf) &&
-                (!s->mode & SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER)))
+                !(s->mode & SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER)))
                {
                SSLerr(SSL_F_WRITE_PENDING,SSL_R_BAD_WRITE_RETRY);
                return(-1);
@@ -638,3 +639,10 @@ static int ssl_mt_error(int n)
                }
        return(ret);
        }
+#else /* !NO_SSL2 */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
+#endif