Attachment #182479 for bug #219197

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

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= sslscan	4	PORTNAME= sslscan
5	PORTVERSION= 1.11.8	5	PORTVERSION= 1.11.10
6	DISTVERSIONSUFFIX= -${GH_ACCOUNT}	6	DISTVERSIONSUFFIX= -${GH_ACCOUNT}
7	CATEGORIES= security	7	CATEGORIES= security
8		8

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1486214215	1	TIMESTAMP = 1494430653
2	SHA256 (rbsec-sslscan-1.11.8-rbsec_GH0.tar.gz) = 1449f8bb45d323b322cb070a74d8dcc57b43ca2dba0560e7a16151efc8b3d911	2	SHA256 (rbsec-sslscan-1.11.10-rbsec_GH0.tar.gz) = fbb26fdbf2cf5b2f3f8c88782721b7875f206552cf83201981411e0af9521204
3	SIZE (rbsec-sslscan-1.11.8-rbsec_GH0.tar.gz) = 51583	3	SIZE (rbsec-sslscan-1.11.10-rbsec_GH0.tar.gz) = 52108




--- 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);
-                            printf("%sRebuild with zlib1g-dev package for zlib support%s\n\n", COL_RED, RESET);
+                            printf("\n");
                         }
 
                         // 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;
                 }
 
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
 		cipherid = SSL_CIPHER_get_id(sslCipherPointer);
+#else
+		cipherid = sslCipherPointer->id;
+#endif
 		cipherid = cipherid & 0x00ffffff;  // remove first byte which is the version (0x03 for TLSv1/SSLv3)
 
                 // Show Cipher Status

Return to bug 219197

Lines 1-40 Link Here

(-)files/patch-sslscan.c (-40 lines)
1	--- sslscan.c.orig 2016-11-06 13:27:11 UTC
2	+++ sslscan.c
3	@@ -829,7 +829,7 @@ int testCompression(struct sslCheckOptio
4	#endif
5	{
6	printf("%sOpenSSL version does not support compression%s\n", COL_RED, RESET);
7	- printf("%sRebuild with zlib1g-dev package for zlib support%s\n\n", COL_RED, RESET);
8	+ printf("\n");
9	}
10
11	// Disconnect SSL over socket
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
30	return false;
31	}
32
33	+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
34	cipherid = SSL_CIPHER_get_id(sslCipherPointer);
35	+#else
36	+ cipherid = sslCipherPointer->id;
37	+#endif
38	cipherid = cipherid & 0x00ffffff; // remove first byte which is the version (0x03 for TLSv1/SSLv3)
39
40	// Show Cipher Status