From 084f66c5d6d800d4391c76ae722bac77cd625544 Mon Sep 17 00:00:00 2001 From: blshkv Date: Tue, 27 Dec 2016 22:57:46 +0800 Subject: [PATCH] ssltest: refresh and remove from profile --- net-analyzer/ssltest/Manifest | 2 +- .../ssltest/files/0.5-friendly500.patch | 21 ++++++++++ .../ssltest/files/ssltest-friendly500.patch | 26 ------------- net-analyzer/ssltest/ssltest-0.4-r1.ebuild | 38 ------------------- net-analyzer/ssltest/ssltest-0.4.ebuild | 32 ---------------- net-analyzer/ssltest/ssltest-0.5.ebuild | 35 +++++++++++++++++ .../base/package.accept_keywords/net-analyzer | 1 - 7 files changed, 57 insertions(+), 98 deletions(-) create mode 100644 net-analyzer/ssltest/files/0.5-friendly500.patch delete mode 100644 net-analyzer/ssltest/files/ssltest-friendly500.patch delete mode 100644 net-analyzer/ssltest/ssltest-0.4-r1.ebuild delete mode 100644 net-analyzer/ssltest/ssltest-0.4.ebuild create mode 100644 net-analyzer/ssltest/ssltest-0.5.ebuild diff --git a/net-analyzer/ssltest/Manifest b/net-analyzer/ssltest/Manifest index 1e2a614bb..372265327 100644 --- a/net-analyzer/ssltest/Manifest +++ b/net-analyzer/ssltest/Manifest @@ -1 +1 @@ -DIST ssltest-0.4.pl 20630 SHA256 81fb3b417143752a49bf4b3db15c078a4719376d30a2a145b354fe059f22e1d5 +DIST ssltest-0.5.pl 32024 SHA256 2b3a4e13f3c45a35ae1dc5e17ccf7e1a4b6cdccdb503f1715525acbf3e696d36 SHA512 543a39e4ea4018340162700ef205531f58e3b31a3ea36895c443de8c604a47b70d8de460ce9456bf5f9b1a452b08c638cec225748e8c0876d98a028ec4c98c33 WHIRLPOOL 1e0da5f255b818ff1a11a9f9a85a70abb65485daa81223f07fa26a1135254310565bcb5e7038a2d86582413b72d9bd4de264363b30682a3a525e2188dbd37ccb diff --git a/net-analyzer/ssltest/files/0.5-friendly500.patch b/net-analyzer/ssltest/files/0.5-friendly500.patch new file mode 100644 index 000000000..a60f184cb --- /dev/null +++ b/net-analyzer/ssltest/files/0.5-friendly500.patch @@ -0,0 +1,21 @@ +--- ssltest.orig 2016-12-27 22:42:02.000000000 +0800 ++++ ssltest 2016-12-27 22:48:09.626470121 +0800 +@@ -59,7 +59,8 @@ + + + # search strings to find to detect friendly "update your browser" responses +-$friendlystring = '^HTTP/1.1 401 Unauthorized'; ++$friendlystring1 = '^HTTP/1.1 401 Unauthorized'; ++$friendlystring2 = '^HTTP/1.1 500 Internal Server Error'; + $friendlydetected = 0; + + GetOptions('h|help' => \$help, 'v|verbose+' => \$verbose, 'r|ssl2' => \$ssl2, 's|ssl3' => \$ssl3, 't|tls1' => \$tls1, 'b|tls11' => \$tls11, 'c|tls12' => \$tls12, 'x|timeout=i' => \$timeout, 'i|ism' => \$ism, 'p|pci' => \$pci, 'g|grep' => \$grep, 'l|list' => \$list, 'f|friend' => \$friend, 'n|nohelp' => \$nohelp, 'z|vercert' => \$vcert); +@@ -336,7 +337,7 @@ + $n = "=" x 40; + print "\n$n\nHTTP Request:\n$n\n$httprequest$n\nHTTP Response:\n$n\n$response\n$n\n\n"; + } +- if ($response =~ m/($friendlystring)/) { ++ if ( ($response =~ m/($friendlystring1)/) || ($response =~ m/($friendlystring1)/) ) { + unsupported($_[0], $_[1], $_[2]); + $friendlydetected = 1; + return; diff --git a/net-analyzer/ssltest/files/ssltest-friendly500.patch b/net-analyzer/ssltest/files/ssltest-friendly500.patch deleted file mode 100644 index ab3e08a16..000000000 --- a/net-analyzer/ssltest/files/ssltest-friendly500.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- ssltest.orig 2011-11-15 16:42:42.910055002 +0800 -+++ ssltest 2011-11-15 16:41:48.193055001 +0800 -@@ -45,7 +45,8 @@ - $pcistring = '^NULL|^ADH-|DES-CBC-|^EXP-'; # No NULL cipher, No Null Auth, No single DES, No Export encryption - - # search strings to find to detect friendly "update your browser" responses --$friendlystring = '^HTTP/1.1 401 Unauthorized'; -+$friendlystring1 = '^HTTP/1.1 401 Unauthorized'; -+$friendlystring2 = '^HTTP/1.1 500 Internal Server Error'; - $friendlydetected = 0; - - GetOptions('h|help' => \$help, 'v|verbose+' => \$verbose, 'r|ssl2' => \$ssl2, 's|ssl3' => \$ssl3, 't|tls1' => \$tls1, 'x|timeout=i' => \$timeout, 'i|ism' => \$ism, 'p|pci' => \$pci, 'g|grep' => \$grep, 'l|list' => \$list, 'f|friend' => \$friend, 'n|nohelp' => \$nohelp); -@@ -192,7 +193,12 @@ - $n = "=" x 40; - print "\n$n\nHTTP Request:\n$n\n$httprequest$n\nHTTP Response:\n$n\n$response\n$n\n\n"; - } -- if ($response =~ m/($friendlystring)/) { -+ if ($response =~ m/($friendlystring1)/) { -+ unsupported($_[0], $_[1], $_[2]); -+ $friendlydetected = 1; -+ return; -+ } -+ if ($response =~ m/($friendlystring2)/) { - unsupported($_[0], $_[1], $_[2]); - $friendlydetected = 1; - return; diff --git a/net-analyzer/ssltest/ssltest-0.4-r1.ebuild b/net-analyzer/ssltest/ssltest-0.4-r1.ebuild deleted file mode 100644 index d9f196797..000000000 --- a/net-analyzer/ssltest/ssltest-0.4-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit eutils - -DESCRIPTION="SSL testing tool written in perl" -HOMEPAGE="http://sites.google.com/site/lupingreycorner/" -SRC_URI="http://sites.google.com/site/lupingreycorner/${P}.pl" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-perl/IO-Socket-SSL" - -S="${WORKDIR}"/${PN} - -src_unpack() { - einfo "Nothing to unpack" - mkdir "${S}" - cp "${DISTDIR}"/"${P}".pl "${S}"/ssltest -} - -src_prepare() { - epatch "${FILESDIR}"/"${PN}"-friendly500.patch -} - -src_compile() { - einfo "Nothing to compile" -} - -src_install() { - dobin ssltest || die "install failed" -} diff --git a/net-analyzer/ssltest/ssltest-0.4.ebuild b/net-analyzer/ssltest/ssltest-0.4.ebuild deleted file mode 100644 index f6886f6f1..000000000 --- a/net-analyzer/ssltest/ssltest-0.4.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -DESCRIPTION="SSL testing tool written in perl" -HOMEPAGE="http://sites.google.com/site/lupingreycorner/" -SRC_URI="http://sites.google.com/site/lupingreycorner/${P}.pl" - -LICENSE="AS IS" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-perl/IO-Socket-SSL" - -S="${WORKDIR}"/${PN} - -src_unpack() { - einfo "Nothing to unpack" - mkdir "${S}" - cp "${DISTDIR}"/"${P}".pl "${S}"/ssltest -} - -src_compile() { - einfo "Nothing to compile" -} - -src_install() { - dobin ssltest || die "install failed" -} diff --git a/net-analyzer/ssltest/ssltest-0.5.ebuild b/net-analyzer/ssltest/ssltest-0.5.ebuild new file mode 100644 index 000000000..d2725138c --- /dev/null +++ b/net-analyzer/ssltest/ssltest-0.5.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils + +DESCRIPTION="SSL testing tool written in perl" +#HOMEPAGE="http://sites.google.com/site/lupingreycorner/" +HOMEPAGE="https://github.com/stephenbradshaw/ssltest" +SRC_URI="https://raw.githubusercontent.com/stephenbradshaw/ssltest/390212c507baa868866f4b4aa572ad8ed5116dd3/ssltest.pl -> ${P}.pl" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="" +IUSE="" + +RDEPEND="dev-perl/IO-Socket-SSL" + +S="${WORKDIR}"/${PN} + +src_unpack() { + mkdir "${S}" + cp "${DISTDIR}"/"${P}".pl "${S}"/ssltest +} + +src_prepare() { + default + epatch "${FILESDIR}"/"${PV}"-friendly500.patch +} + +src_install() { + dobin ssltest +} diff --git a/profiles/pentoo/base/package.accept_keywords/net-analyzer b/profiles/pentoo/base/package.accept_keywords/net-analyzer index 3c7ac0a9a..985f5e27c 100644 --- a/profiles/pentoo/base/package.accept_keywords/net-analyzer +++ b/profiles/pentoo/base/package.accept_keywords/net-analyzer @@ -86,7 +86,6 @@ net-analyzer/nessus-plugins net-analyzer/snort ~net-analyzer/sslsniff-0.8 ~net-analyzer/sslstrip-0.9 -~net-analyzer/ssltest-0.4 =net-analyzer/sslyze-0.14* ~net-analyzer/subdomainer-1.3 ~net-analyzer/tcpdump-4.3.0