sslscan: fix build agains libressl-2.3
This commit is contained in:
parent
9f2f44af19
commit
d06a6686ce
|
@ -1,23 +1,5 @@
|
|||
LibreSSL patch by xtraeme:
|
||||
|
||||
- SSLv2_client_method() completely removed; SSLv2 is unsupported.
|
||||
- SSL_METHOD has been const'ified.
|
||||
|
||||
--- sslscan.1.orig 2014-08-04 18:31:56.219747964 +0200
|
||||
+++ sslscan.1 2014-08-04 18:32:12.762885840 +0200
|
||||
@@ -34,10 +34,6 @@ ports (i.e. host:port). One target per l
|
||||
List only accepted ciphers
|
||||
(default is to listing all ciphers).
|
||||
.TP
|
||||
-.B \-\-ssl2
|
||||
-.br
|
||||
-Only check SSLv2 ciphers.
|
||||
-.TP
|
||||
.B \-\-ssl3
|
||||
.br
|
||||
Only check SSLv3 ciphers.
|
||||
--- sslscan.c.orig 2009-09-01 14:35:59.000000000 +0200
|
||||
+++ sslscan.c 2014-08-04 18:38:11.405056914 +0200
|
||||
+++ sslscan.c 2016-03-31 22:47:08.828977557 +0200
|
||||
@@ -91,7 +91,7 @@ struct sslCipher
|
||||
char *version;
|
||||
int bits;
|
||||
|
@ -50,7 +32,7 @@ LibreSSL patch by xtraeme:
|
|||
- printf("SSLv2 ");
|
||||
- }
|
||||
- else if (sslCipherPointer->sslMethod == SSLv3_client_method())
|
||||
+ if (sslCipherPointer->sslMethod == SSLv3_client_method())
|
||||
+ if (sslCipherPointer->sslMethod == SSLv23_client_method())
|
||||
{
|
||||
if (options->xmlOutput != 0)
|
||||
fprintf(options->xmlOutput, "SSLv3\" bits=\"");
|
||||
|
@ -77,7 +59,7 @@ LibreSSL patch by xtraeme:
|
|||
- printf(" SSLv2 ");
|
||||
- }
|
||||
- else if (sslMethod == SSLv3_client_method())
|
||||
+ if (sslMethod == SSLv3_client_method())
|
||||
+ if (sslMethod == SSLv23_client_method())
|
||||
{
|
||||
if (options->xmlOutput != 0)
|
||||
fprintf(options->xmlOutput, " <defaultcipher sslversion=\"SSLv3\" bits=\"");
|
||||
|
@ -90,13 +72,14 @@ LibreSSL patch by xtraeme:
|
|||
ASN1_OBJECT *asn1Object = NULL;
|
||||
X509_EXTENSION *extension = NULL;
|
||||
char buffer[1024];
|
||||
@@ -1192,15 +1174,10 @@ int testHost(struct sslCheckOptions *opt
|
||||
@@ -1192,17 +1174,12 @@ int testHost(struct sslCheckOptions *opt
|
||||
switch (options->sslVersion)
|
||||
{
|
||||
case ssl_all:
|
||||
- status = defaultCipher(options, SSLv2_client_method());
|
||||
- if (status != false)
|
||||
status = defaultCipher(options, SSLv3_client_method());
|
||||
- status = defaultCipher(options, SSLv3_client_method());
|
||||
+ status = defaultCipher(options, SSLv23_client_method());
|
||||
if (status != false)
|
||||
status = defaultCipher(options, TLSv1_client_method());
|
||||
break;
|
||||
|
@ -104,8 +87,11 @@ LibreSSL patch by xtraeme:
|
|||
- status = defaultCipher(options, SSLv2_client_method());
|
||||
- break;
|
||||
case ssl_v3:
|
||||
status = defaultCipher(options, SSLv3_client_method());
|
||||
- status = defaultCipher(options, SSLv3_client_method());
|
||||
+ status = defaultCipher(options, SSLv23_client_method());
|
||||
break;
|
||||
case tls_v1:
|
||||
status = defaultCipher(options, TLSv1_client_method());
|
||||
@@ -1298,10 +1275,6 @@ int main(int argc, char *argv[])
|
||||
options.starttls = true;
|
||||
}
|
||||
|
@ -117,17 +103,21 @@ LibreSSL patch by xtraeme:
|
|||
// SSL v3 only...
|
||||
else if (strcmp("--ssl3", argv[argLoop]) == 0)
|
||||
options.sslVersion = ssl_v3;
|
||||
@@ -1415,13 +1388,9 @@ int main(int argc, char *argv[])
|
||||
@@ -1415,15 +1388,11 @@ int main(int argc, char *argv[])
|
||||
switch (options.sslVersion)
|
||||
{
|
||||
case ssl_all:
|
||||
- populateCipherList(&options, SSLv2_client_method());
|
||||
populateCipherList(&options, SSLv3_client_method());
|
||||
- populateCipherList(&options, SSLv3_client_method());
|
||||
+ populateCipherList(&options, SSLv23_client_method());
|
||||
populateCipherList(&options, TLSv1_client_method());
|
||||
break;
|
||||
- case ssl_v2:
|
||||
- populateCipherList(&options, SSLv2_client_method());
|
||||
- break;
|
||||
case ssl_v3:
|
||||
populateCipherList(&options, SSLv3_client_method());
|
||||
- populateCipherList(&options, SSLv3_client_method());
|
||||
+ populateCipherList(&options, SSLv23_client_method());
|
||||
break;
|
||||
case tls_v1:
|
||||
populateCipherList(&options, TLSv1_client_method());
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
pkgname=sslscan
|
||||
version=1.8.2
|
||||
revision=8
|
||||
broken="libressl-2.3/SSLv3_client_method"
|
||||
build_style=gnu-makefile
|
||||
makedepends="libressl-devel"
|
||||
short_desc="A Fast SSL scanner"
|
||||
|
|
Loading…
Reference in New Issue