Attachment #161875 for bug #203675

View | Details | Raw Unified | Return to bug 203675
Collapse All | Expand All

Lines 13-22 Link Here

(-)benchmarks/httperf/Makefile (-1 / +4 lines)
13		13
14	USE_OPENSSL= yes	14	USE_OPENSSL= yes
15	GNU_CONFIGURE= yes	15	GNU_CONFIGURE= yes
16	USES= gmake	16	USES= gmake libtool
17	MAKE_ARGS= LIBUTIL_OBJS=ssl_writev.o \	17	MAKE_ARGS= LIBUTIL_OBJS=ssl_writev.o \
18	exec_prefix=${PREFIX}	18	exec_prefix=${PREFIX}
19		19
		20	CFLAGS+= -I${OPENSSLINC}
		21	LDFLAGS+= -L${OPENSSLLIB}
		22
20	PLIST_FILES= bin/httperf \	23	PLIST_FILES= bin/httperf \
21	man/man1/httperf.1.gz	24	man/man1/httperf.1.gz
22		25




--- src/httperf.c.orig	2007-12-11 10:48:02.000000000 +0000
+++ src/httperf.c	2007-12-11 10:48:48.000000000 +0000
@@ -78,6 +78,10 @@
 #include <conn.h>
 #include <timer.h>
 
+#ifdef __FreeBSD__
+#include <machine/floatingpoint.h>
+#endif
+
 #ifdef HAVE_SSL
 #  include <openssl/rand.h>
 #endif




--- src/httperf.c.orig	2007-04-07 07:01:56 UTC
+++ src/httperf.c
@@ -78,6 +78,10 @@
 #include <conn.h>
 #include <timer.h>
 
+#ifdef __FreeBSD__
+#include <machine/floatingpoint.h>
+#endif
+
 #ifdef HAVE_SSL
 #  include <openssl/rand.h>
 #endif
@@ -808,7 +812,12 @@ main (int argc, char **argv)
       SSLeay_add_ssl_algorithms ();
 
       /* for some strange reason, SSLv23_client_method () doesn't work here */
+#ifndef OPENSSL_NO_SSL3
       ssl_ctx = SSL_CTX_new (SSLv3_client_method ());
+#else
+      ssl_ctx = SSL_CTX_new (SSLv23_client_method ());
+      SSL_CTX_set_options (ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 );
+#endif
       if (!ssl_ctx)
 	{
 	  ERR_print_errors_fp (stderr);

Return to bug 203675

Lines 1-13 Link Here

(-)benchmarks/httperf/files/patch-httperf.c (-13 lines)
1	--- src/httperf.c.orig 2007-12-11 10:48:02.000000000 +0000
2	+++ src/httperf.c 2007-12-11 10:48:48.000000000 +0000
3	@@ -78,6 +78,10 @@
4	#include <conn.h>
5	#include <timer.h>
6
7	+#ifdef __FreeBSD__
8	+#include <machine/floatingpoint.h>
9	+#endif
10	+
11	#ifdef HAVE_SSL
12	# include <openssl/rand.h>
13	#endif

Line 0 Link Here

(-)benchmarks/httperf/files/patch-src_httperf.c (+26 lines)
	1	--- src/httperf.c.orig 2007-04-07 07:01:56 UTC
	2	+++ src/httperf.c
	3	@@ -78,6 +78,10 @@
	4	#include <conn.h>
	5	#include <timer.h>
	6
	7	+#ifdef __FreeBSD__
	8	+#include <machine/floatingpoint.h>
	9	+#endif
	10	+
	11	#ifdef HAVE_SSL
	12	# include <openssl/rand.h>
	13	#endif
	14	@@ -808,7 +812,12 @@ main (int argc, char **argv)
	15	SSLeay_add_ssl_algorithms ();
	16
	17	/* for some strange reason, SSLv23_client_method () doesn't work here */
	18	+#ifndef OPENSSL_NO_SSL3
	19	ssl_ctx = SSL_CTX_new (SSLv3_client_method ());
	20	+#else
	21	+ ssl_ctx = SSL_CTX_new (SSLv23_client_method ());
	22	+ SSL_CTX_set_options (ssl_ctx, SSL_OP_NO_SSLv2 \| SSL_OP_NO_SSLv3 );
	23	+#endif
	24	if (!ssl_ctx)
	25	{
	26	ERR_print_errors_fp (stderr);