svn commit: r442970 - in head/security/sslscan: . files

[Gavin Atkinson]

Author: gavin (src,doc committer)
Date: Fri Jun  9 03:35:05 2017
New Revision: 442970
URL: https://svnweb.freebsd.org/changeset/ports/442970

Log:
  sslscan: Update to 1.11.10.
  
  PR:		219197
  Submitted by:	Piotr Kubaj (with minor changes)
  Approved by:	rene

Modified:
  head/security/sslscan/Makefile
  head/security/sslscan/distinfo
  head/security/sslscan/files/patch-sslscan.c

Modified: head/security/sslscan/Makefile
==============================================================================
--- head/security/sslscan/Makefile	Fri Jun  9 03:02:42 2017	(r442969)
+++ head/security/sslscan/Makefile	Fri Jun  9 03:35:05 2017	(r442970)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sslscan
-PORTVERSION=	1.11.8
+PORTVERSION=	1.11.10
 DISTVERSIONSUFFIX=	-${GH_ACCOUNT}
 CATEGORIES=	security
 

Modified: head/security/sslscan/distinfo
==============================================================================
--- head/security/sslscan/distinfo	Fri Jun  9 03:02:42 2017	(r442969)
+++ head/security/sslscan/distinfo	Fri Jun  9 03:35:05 2017	(r442970)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486214215
-SHA256 (rbsec-sslscan-1.11.8-rbsec_GH0.tar.gz) = 1449f8bb45d323b322cb070a74d8dcc57b43ca2dba0560e7a16151efc8b3d911
-SIZE (rbsec-sslscan-1.11.8-rbsec_GH0.tar.gz) = 51583
+TIMESTAMP = 1494430653
+SHA256 (rbsec-sslscan-1.11.10-rbsec_GH0.tar.gz) = fbb26fdbf2cf5b2f3f8c88782721b7875f206552cf83201981411e0af9521204
+SIZE (rbsec-sslscan-1.11.10-rbsec_GH0.tar.gz) = 52108

Modified: head/security/sslscan/files/patch-sslscan.c
==============================================================================
--- head/security/sslscan/files/patch-sslscan.c	Fri Jun  9 03:02:42 2017	(r442969)
+++ head/security/sslscan/files/patch-sslscan.c	Fri Jun  9 03:35:05 2017	(r442970)
@@ -9,32 +9,3 @@
                          }
  
                          // 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