X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=ssl%2Fs2_pkt.c;h=0b48ea28948bf66d9b0e1e7cb674ff5e2a56f113;hp=a1bb5bca4b8030259317961258338b74c632738f;hb=0135e33511fd428ef3db66cfa26418bebdb1a58c;hpb=11b1adadbda749568b28ea50ab0a0379dde864aa

diff --git a/ssl/s2_pkt.c b/ssl/s2_pkt.c
index a1bb5bca4b..0b48ea2894 100644
--- 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 -
@@ -638,3 +644,10 @@ static int ssl_mt_error(int n)
 		}
 	return(ret);
 	}
+#else /* !NO_SSL2 */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
+#endif