Attachment #179595 for bug #213652

Lines 2-8 Link Here

(-)Makefile (-3 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= sslscan	4	PORTNAME= sslscan
5	PORTVERSION= 1.11.6	5	PORTVERSION= 1.11.8
6	DISTVERSIONSUFFIX= -${GH_ACCOUNT}	6	DISTVERSIONSUFFIX= -${GH_ACCOUNT}
7	CATEGORIES= security	7	CATEGORIES= security
8		8
Lines 11-18 Link Here
11		11
12	LICENSE= GPLv3	12	LICENSE= GPLv3
13		13
14	USES= gmake	14	USES= gmake ssl
15	USE_OPENSSL= yes
16	USE_GITHUB= yes	15	USE_GITHUB= yes
17	GH_ACCOUNT= rbsec	16	GH_ACCOUNT= rbsec
18		17

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1464783619	1	TIMESTAMP = 1486214215
2	SHA256 (rbsec-sslscan-1.11.6-rbsec_GH0.tar.gz) = 18932a78ad968dc5859b8cc72c84e64a46367887eb9302eaf13069bb9da1e08d	2	SHA256 (rbsec-sslscan-1.11.8-rbsec_GH0.tar.gz) = 1449f8bb45d323b322cb070a74d8dcc57b43ca2dba0560e7a16151efc8b3d911
3	SIZE (rbsec-sslscan-1.11.6-rbsec_GH0.tar.gz) = 50002	3	SIZE (rbsec-sslscan-1.11.8-rbsec_GH0.tar.gz) = 51583

Lines 1-4 Link Here

(-)files/patch-Makefile (-3 / +3 lines)
1	--- Makefile.orig 2016-03-24 21:02:55 UTC	1	--- Makefile.orig 2016-11-06 13:27:11 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -3,7 +3,7 @@ ifndef CC	3	@@ -3,7 +3,7 @@ ifndef CC
4	CC=gcc	4	CC=gcc
Lines 21-29 Link Here
21	MAN1DIR = $(MANDIR)/man1	21	MAN1DIR = $(MANDIR)/man1
22		22
23	WARNINGS = -Wall -Wformat=2	23	WARNINGS = -Wall -Wformat=2
24	@@ -68,6 +68,9 @@ install:	24	@@ -70,6 +70,9 @@ ifeq ($(OS), Darwin)
25	ifeq ($(OS), Darwin)
26	install sslscan $(DESTDIR)$(BINDIR)/sslscan;	25	install sslscan $(DESTDIR)$(BINDIR)/sslscan;
		26	install -d $(DESTDIR)$(MAN1DIR)/;
27	install sslscan.1 $(DESTDIR)$(MAN1DIR)/sslscan.1;	27	install sslscan.1 $(DESTDIR)$(MAN1DIR)/sslscan.1;
28	+else ifeq ($(OS), FreeBSD)	28	+else ifeq ($(OS), FreeBSD)
29	+ install -s -m 755 sslscan $(DESTDIR)$(BINDIR)	29	+ install -s -m 755 sslscan $(DESTDIR)$(BINDIR)




--- sslscan.c.orig	2016-11-06 13:27:11 UTC
+++ sslscan.c
@@ -829,7 +829,7 @@ int testCompression(struct sslCheckOptio
 #endif
                         {
                             printf("%sOpenSSL version does not support compression%s\n", COL_RED, RESET);

                         }
 
                         // Disconnect SSL over socket
@@ -1155,14 +1155,14 @@ int testRenegotiation(struct sslCheckOpt
                                 printf_verbose("Attempting SSL_do_handshake(ssl)\n");
                                 SSL_do_handshake(ssl); // Send renegotiation request to server //TODO :: XXX hanging here
 
-                                if (ssl->state == SSL_ST_OK)
+                                if (SSL_get_state(ssl) == SSL_ST_OK)
                                 {
                                     res = SSL_do_handshake(ssl); // Send renegotiation request to server
                                     if( res != 1 )
                                     {
                                         printf_error("\n\nSSL_do_handshake() call failed\n");
                                     }
-                                    if (ssl->state == SSL_ST_OK)
+                                    if (SSL_get_state(ssl) == SSL_ST_OK)
                                     {
                                         /* our renegotiation is complete */
                                         renOut->supported = true;
@@ -1504,7 +1504,11 @@ int testCipher(struct sslCheckOptions *o
                     return false;
                 }
 

Return to bug 213652

Lines 1-6 Link Here

(-)files/patch-sslscan.c (-3 / +20 lines)
1	--- sslscan.c.orig 2016-03-24 21:02:55 UTC	1	--- sslscan.c.orig 2016-11-06 13:27:11 UTC
2	+++ sslscan.c	2	+++ sslscan.c
3	@@ -788,7 +788,7 @@ int testCompression(struct sslCheckOptio	3	@@ -829,7 +829,7 @@ int testCompression(struct sslCheckOptio
4	#endif	4	#endif
5	{	5	{
6	printf("%sOpenSSL version does not support compression%s\n", COL_RED, RESET);	6	printf("%sOpenSSL version does not support compression%s\n", COL_RED, RESET);
Lines 9-15 Link Here
9	}	9	}
10		10
11	// Disconnect SSL over socket	11	// Disconnect SSL over socket
12	@@ -1291,7 +1291,11 @@ int testCipher(struct sslCheckOptions *o	12	@@ -1155,14 +1155,14 @@ int testRenegotiation(struct sslCheckOpt
		13	printf_verbose("Attempting SSL_do_handshake(ssl)\n");
		14	SSL_do_handshake(ssl); // Send renegotiation request to server //TODO :: XXX hanging here
		15
		16	- if (ssl->state == SSL_ST_OK)
		17	+ if (SSL_get_state(ssl) == SSL_ST_OK)
		18	{
		19	res = SSL_do_handshake(ssl); // Send renegotiation request to server
		20	if( res != 1 )
		21	{
		22	printf_error("\n\nSSL_do_handshake() call failed\n");
		23	}
		24	- if (ssl->state == SSL_ST_OK)
		25	+ if (SSL_get_state(ssl) == SSL_ST_OK)
		26	{
		27	/* our renegotiation is complete */
		28	renOut->supported = true;
		29	@@ -1504,7 +1504,11 @@ int testCipher(struct sslCheckOptions *o
13	return false;	30	return false;
14	}	31	}
15		32