diff options
| author | gavin <gavin@FreeBSD.org> | 2017-06-09 11:35:05 +0800 |
|---|---|---|
| committer | gavin <gavin@FreeBSD.org> | 2017-06-09 11:35:05 +0800 |
| commit | fc80957b57f9fbf8bd4d28da94003c355afa7b07 (patch) | |
| tree | a5b3517e4063f695cf50186a6cff5ab6f7db8af9 /security | |
| parent | b1fd9f79145d733a5aad67ecbbe1ecaeca5cb8a7 (diff) | |
| download | freebsd-ports-gnome-fc80957b57f9fbf8bd4d28da94003c355afa7b07.tar.gz freebsd-ports-gnome-fc80957b57f9fbf8bd4d28da94003c355afa7b07.tar.zst freebsd-ports-gnome-fc80957b57f9fbf8bd4d28da94003c355afa7b07.zip | |
sslscan: Update to 1.11.10.
PR: 219197
Submitted by: Piotr Kubaj (with minor changes)
Approved by: rene
Diffstat (limited to 'security')
| -rw-r--r-- | security/sslscan/Makefile | 2 | ||||
| -rw-r--r-- | security/sslscan/distinfo | 6 | ||||
| -rw-r--r-- | security/sslscan/files/patch-sslscan.c | 29 |
3 files changed, 4 insertions, 33 deletions
diff --git a/security/sslscan/Makefile b/security/sslscan/Makefile index a35092438a11..fba4dcffc2a0 100644 --- a/security/sslscan/Makefile +++ b/security/sslscan/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sslscan -PORTVERSION= 1.11.8 +PORTVERSION= 1.11.10 DISTVERSIONSUFFIX= -${GH_ACCOUNT} CATEGORIES= security diff --git a/security/sslscan/distinfo b/security/sslscan/distinfo index 05940fb50780..3c0eb896bb9a 100644 --- a/security/sslscan/distinfo +++ b/security/sslscan/distinfo @@ -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 diff --git a/security/sslscan/files/patch-sslscan.c b/security/sslscan/files/patch-sslscan.c index f0bae4b33cd4..00bf0aa861a0 100644 --- a/security/sslscan/files/patch-sslscan.c +++ b/security/sslscan/files/patch-sslscan.c @@ -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 |