sslyze: v1.4.3 bump

This commit is contained in:
blshkv 2018-08-08 08:58:17 +08:00
parent 0d951a49f4
commit 010b2e29ac
No known key found for this signature in database
GPG key ID: 273E3E90D1A6294F
5 changed files with 1 additions and 127 deletions

View file

@ -1,3 +1 @@
DIST sslyze-1.3.4.tar.gz 2427566 BLAKE2B 002755723e2f1f4eea0da4f5cdecfc1ee5109e94cc39f9063ec35ae882a269f0e7546917a85e6a0f0bdcb58f1c746a5a9fc33dfed866ef79ed20189436d9bb54 SHA512 0e82de17c1e53aec9a4e7a84291e0e7e83fb358ed23e822daed7f1febd1fc30c2b49d293e7a688d3089d51c79bdbf653beac7e2c73b2213b9428e02ed1b11436
DIST sslyze-1.4.1.tar.gz 2525359 BLAKE2B 8b7730ef2755fcb6ae7cfafedac3c9c286324430b6debb859bea1afbc1375ff44abaa9081cce099bbac3979c4e2cb625525374260e83770f51b39457a5867747 SHA512 3843c5a52b963e763604a3897760d9e49141690f377ece86f5c56d43689ba002ca56e27d5ae5fad1bea6c5f3ea0b2497feaf627d9b6d0e6b7e8de4c1cdcd2615
DIST sslyze-1.4.2.tar.gz 2609182 BLAKE2B 765e44f62b72d86bf67aafa68fe6a0ad0573e3aefce41684f926dd05f4265be274c60350294b1e708432990dea3e5b96a107e187bcd32574f005978b53f62adc SHA512 7c84074fe36e72f1bf7644dc2a75330cdd1316bb60efde0df3a1a6f1dc1dc5b241364303e2e02ee992d5b16d67fb447b6d29826e3b07d0565759664f1a722c0b
DIST sslyze-1.4.3.tar.gz 2609633 BLAKE2B 25519f5aa2a64d8ff2bee967255b639a1ca40651c9b70bf561a334a832c3274448b225bd03346ed7446827f39f6a7cde671e6cf5cec02d3095eb6edbb3fde317 SHA512 e57cbfbf15d7d4138e29ef0c33c04bf034853bbe80c5bf34ebe1631deb22b29b4ce593f6f1ab73a5a154feb87b4c566f35e66de79a3cf03e44721aaf728fa519

View file

@ -1,68 +0,0 @@
diff -urN sslyze-1.4.2.orig/sslyze/plugins/certificate_info_plugin.py sslyze-1.4.2/sslyze/plugins/certificate_info_plugin.py
--- sslyze-1.4.2.orig/sslyze/plugins/certificate_info_plugin.py 2018-05-20 07:40:29.000000000 +0800
+++ sslyze-1.4.2/sslyze/plugins/certificate_info_plugin.py 2018-07-01 19:07:22.794032931 +0800
@@ -232,8 +232,9 @@
is_leaf_certificate_ev (bool): True if the leaf certificate is Extended Validation according to Mozilla.
certificate_has_must_staple_extension (bool): True if the leaf certificate has the OCSP Must-Staple
extension as defined in RFC 6066.
- certificate_included_scts_count (int): The number of Signed Certificate Timestamps (SCTs) for Certificate
- Transparency embedded in the leaf certificate.
+ certificate_included_scts_count (Optional[int]): The number of Signed Certificate Timestamps (SCTs) for
+ Certificate Transparency embedded in the leaf certificate. None if the version of OpenSSL installed on the
+ system is too old to be able to parse the SCT extension.
ocsp_response (Optional[Dict[Text, Any]]): The OCSP response returned by the server. None if no response was
sent by the server.
ocsp_response_status (Optional[OcspResponseStatusEnum]): The status of the OCSP response returned by the server.
@@ -469,7 +470,9 @@
# Look for SCT extension
scts_count = self.certificate_included_scts_count
- if scts_count == 0:
+ if scts_count is None:
+ sct_txt = 'OK - Extension present'
+ elif scts_count == 0:
sct_txt = 'NOT SUPPORTED - Extension not found'
elif scts_count < 3:
sct_txt = 'WARNING - Only {} SCTs included but Google recommends 3 or more'.format(str(scts_count))
diff -urN sslyze-1.4.2.orig/sslyze/plugins/utils/certificate_utils.py sslyze-1.4.2/sslyze/plugins/utils/certificate_utils.py
--- sslyze-1.4.2.orig/sslyze/plugins/utils/certificate_utils.py 2018-05-20 07:40:29.000000000 +0800
+++ sslyze-1.4.2/sslyze/plugins/utils/certificate_utils.py 2018-07-02 22:14:50.250935274 +0800
@@ -3,18 +3,17 @@
from __future__ import unicode_literals
import ssl
-from base64 import b64encode
-from hashlib import sha256
+from typing import List, Optional
+
import cryptography
-from cryptography.hazmat.primitives.asymmetric import rsa, dsa, ec
-from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat
-from cryptography.x509 import DNSName
-from cryptography.x509 import ExtensionNotFound
-from cryptography.x509 import ExtensionOID
-from cryptography.x509 import NameOID
-from typing import List
-from typing import Text
+from cryptography.hazmat.primitives.asymmetric import dsa, ec, rsa
+from cryptography.hazmat.primitives.serialization import Encoding, \
+ PublicFormat
+from cryptography.x509 import DNSName, ExtensionNotFound, ExtensionOID, \
+ NameOID
+from base64 import b64encode
+from hashlib import sha256
class CertificateUtils(object):
"""Various utility methods for handling X509 certificates as parsed by the cryptography module.
@@ -132,6 +131,10 @@
ExtensionOID.PRECERT_SIGNED_CERTIFICATE_TIMESTAMPS
)
+ if isinstance(sct_ext.value, cryptography.x509.UnrecognizedExtension):
+ # The version of OpenSSL on the system is too old and can't parse the SCT extension
+ return None
+
# Count the number of entries in the extension
scts_count = len(sct_ext.value)
except ExtensionNotFound:

View file

@ -1,32 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 versionator
DESCRIPTION="Fast and full-featured SSL scanner"
HOMEPAGE="https://github.com/nabla-c0d3/sslyze"
SRC_URI="https://github.com/nabla-c0d3/sslyze/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND=""
#RDEPEND="=dev-python/nassl-$(get_version_component_range 1-2)*"
RDEPEND="=dev-python/nassl-1.0*[${PYTHON_USEDEP}]
dev-python/typing[${PYTHON_USEDEP}]
dev-python/enum34[${PYTHON_USEDEP}]
>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
>=dev-python/tls_parser-1.2.0[${PYTHON_USEDEP}]"
#typing; python_version < '3.5'
#enum34; python_version < '3.4'
#python_prepare_all(){
# sed -e "s|cryptography==1.9|cryptography>=1.9, <=2.0.3|" -i setup.py
# distutils-r1_python_prepare_all
#}

View file

@ -1,24 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit distutils-r1
DESCRIPTION="Fast and full-featured SSL scanner"
HOMEPAGE="https://github.com/nabla-c0d3/sslyze"
SRC_URI="https://github.com/nabla-c0d3/sslyze/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND=""
RDEPEND="=dev-python/nassl-1.1*[${PYTHON_USEDEP}]
>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
>=dev-python/tls_parser-1.2.0[${PYTHON_USEDEP}]
$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python{2_7,3_3,3_4})
"