1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

sslscan: Update to 1.11.10.

PR:		219197
Submitted by:	Piotr Kubaj (with minor changes)
Approved by:	rene
This commit is contained in:
Gavin Atkinson 2017-06-09 03:35:05 +00:00
parent 6fa25b6fde
commit 650df6e04a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=442970
3 changed files with 4 additions and 33 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= sslscan
PORTVERSION= 1.11.8
PORTVERSION= 1.11.10
DISTVERSIONSUFFIX= -${GH_ACCOUNT}
CATEGORIES= security

View File

@ -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

View File

@ -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