Merge pull request #597 from nabla-c0d3/dev-5-1-2

Updates for 5.1.2

dev-requirements.txt

@@ -1,10 +1,10 @@
 mypy==0.981
-flake8<5.0.0
-invoke<2.0.0
-pytest<8.0.0
+flake8
+invoke>=2,<3
+pytest==7.2.2
 sphinx
 sphinx-rtd-theme
-twine
+twine>=4,<5
 sphinx-autodoc-typehints
 black==22.10.0
 pytest-cov

setup.py

@@ -99,10 +99,10 @@ def get_include_files() -> List[Tuple[str, str]]:
     # Dependencies
     install_requires=[
         "nassl>=5,<6",
-        "cryptography>=2.6,<39",
+        "cryptography>=2.6,<40",
         "tls-parser>=2,<3",
         "pydantic>=1.7,<1.11",
-        "pyOpenSSL>=20,<23",
+        "pyOpenSSL>=20,<24",
     ],
     # cx_freeze info for Windows builds with Python embedded
     options={"build_exe": {"packages": ["cffi", "cryptography"], "include_files": get_include_files()}},

sslyze/__version__.py

@@ -1,5 +1,5 @@
 __title__ = "SSLyze"
-__version__ = "5.1.1"
+__version__ = "5.1.2"
 __description__ = "Fast and powerful SSL/TLS scanning library."
 __author__ = "Alban Diquet"
 __author_email__ = "nabla.c0d3@gmail.com"

sslyze/plugins/certificate_info/trust_stores/pem_files/microsoft_windows.yaml

@@ -1,8 +1,8 @@
 platform: MICROSOFT_WINDOWS
 version: null
 url: https://ccadb-public.secure.force.com/microsoft/IncludedCACertificateReportForMSFT
-date_fetched: 2022-12-04
-trusted_certificates_count: 256
+date_fetched: 2023-02-19
+trusted_certificates_count: 241
 trusted_certificates:
 - subject_name: A-Trust-Root-07
   fingerprint: 8ac552ad577e37ad2c6808d72aa331d6a96b4b3febff34ce9bc0578e08055ec3
@@ -64,12 +64,6 @@ trusted_certificates:
   fingerprint: 9a114025197c5bb95d94e63d55cd43790847b646b23cdf11ada4a00eff15fb48
 - subject_name: Buypass Class 3 Root CA
   fingerprint: edf7ebbca27a2a384d387b7d4010c666e2edb4843e4c29b4ae1d5b9332e6b24d
-- subject_name: CA DATEV BT 03
-  fingerprint: 0c0b6b2bd1edd7b27fead157f8e846b335b784a39f06c47216c8746f64c5ceda
-- subject_name: CA DATEV INT 03
-  fingerprint: 8ba1bd9c88efb3947e60ebe21137f81df7f09994cef27f097055018b8194c634
-- subject_name: CA DATEV STD 03
-  fingerprint: 54ae8a683fe2d78ff1ef0e0b3f58425092953ba08c67fe4a95595d1cebcdcb30
 - subject_name: CA Disig Root R2
   fingerprint: e23d4a036d7b70e9f595b1422079d2b91edfbb1fb651a0633eaa8a9dc5f80703
 - subject_name: CAEDICOM Root
@@ -86,8 +80,6 @@ trusted_certificates:
   fingerprint: ffb85c26308a961351249ea641f659d49f639e91daed9c92d046ccdcecc93d2f
 - subject_name: CHAMBERS OF COMMERCE ROOT - 2016
   fingerprint: 04f1bec36951bc1454a904ce32890c5da3cde1356b7900f6e62dfa2041ebad51
-- subject_name: CISRCA1
-  fingerprint: 12ff248372bd87e44ece432198be9b04525f33dee00356fd646f8acc01412f86
 - subject_name: COMODO Certification Authority
   fingerprint: 1a0d20445de5ba1862d19ef880858cbce50102b36e8f0a040c3c69e74522fe6e
 - subject_name: COMODO ECC Certification Authority
@@ -118,8 +110,6 @@ trusted_certificates:
   fingerprint: 063e4afac491dfd332f3089b8542e94617d893d7fe944e10a7937ee29d9693c0
 - subject_name: ComSign Global Root CA
   fingerprint: 2605875afcc176b2d66dd66a995d7f8d5ebb86ce120d0e7e9e7c6ef294a27d4c
-- subject_name: Cybertrust Global Root
-  fingerprint: 960adf0063e96356750c2965dd0a0867da0b9cbd6e77714aeafb2349ab393da3
 - subject_name: Cybertrust iTrust Root Certification Authority
   fingerprint: e90dbeb2d360cc6f98994eefc68c4147f2dfd9c68a3bf063c6a971f3e11baf4e
 - subject_name: D-TRUST Root CA 3 2013
@@ -128,8 +118,6 @@ trusted_certificates:
   fingerprint: 49e7a442acf0ea6287050054b52564b650e4f49e42e348d6aa38e039e957b1c1
 - subject_name: D-TRUST Root Class 3 CA 2 EV 2009
   fingerprint: eec5496b988ce98625b934092eec2908bed0b0f316c2d4730c84eaf1f3d34881
-- subject_name: DST Root CA X3
-  fingerprint: 0687260331a72403d909f105e69bcf0d32e1bd2493ffc6d9206d11bcd6770739
 - subject_name: DVV Gov. Root CA - G3 ECC
   fingerprint: 5546a52504fba74f61ffd4890067529ade3b9c9d07e502592831ccda9b369fd3
 - subject_name: DVV Gov. Root CA - G3 RSA
@@ -192,6 +180,8 @@ trusted_certificates:
   fingerprint: db3517d1f6732a2d5ab97c533ec70779ee3270a62fb4ac4238372460e6f01e88
 - subject_name: Entrust.net Certification Authority (2048)
   fingerprint: 6dc47172e01cbcb0bf62580d895fe2b8ac9ad4f873801e0c10b9c837d21eb177
+- subject_name: FNMT Clase 2 CA
+  fingerprint: 62b9267266212832a8e22dab933d91c7011274acf71703f9cc97833751a6e94f
 - subject_name: Fina Root CA
   fingerprint: 5ab4fcdb180b5b6af0d262a2375a2c77d25602015d96648756611e2e78c53ad3
 - subject_name: "F\u0151tan\xFAs\xEDtv\xE1nykiad\xF3 - Korm\xE1nyzati Hiteles\xED\
@@ -217,10 +207,6 @@ trusted_certificates:
   fingerprint: 15d5b8774619ea7d54ce1ca6d0b0c403e037a917f131e8a04e1e6b7a71babce5
 - subject_name: GTS Root R4
   fingerprint: 71cca5391f9e794b04802530b363e121da8a3043bb26662fea4dca7fc951a4bd
-- subject_name: GeoTrust Universal CA
-  fingerprint: a0459b9f63b22559f5fa5d4c6db3f9f72ff19342033578f073bf1d1b46cbb912
-- subject_name: Global Chambersign Root
-  fingerprint: ef3cb417fc8ebf6f97876c9e4ece39de1ea5fe649141d1028b7d11c0b2298ced
 - subject_name: Global Chambersign Root - 2008
   fingerprint: 136335439334a7698016a0d324de72284e079d7b5220bb8fbd747816eebebaca
 - subject_name: GlobalSign
@@ -229,8 +215,6 @@ trusted_certificates:
   fingerprint: 2cabeafe37d06ca22aba7391c0033d25982952c453647349763a3ab5ad6ccf69
 - subject_name: GlobalSign
   fingerprint: bec94911c2955676db6c0a550986d76e3ba005667c442c9762b4fbb773de228c
-- subject_name: GlobalSign
-  fingerprint: ca42dd41745fd0b81eb902362cf9d8bf719da1bd1b1efc946f5b4c99f42c1b9e
 - subject_name: GlobalSign
   fingerprint: cbb522d7b7f127ad6a0113865bdf1cd4102e7d0759af635a7cf4720dc963c53b
 - subject_name: GlobalSign Client Authentication Root E45
@@ -261,10 +245,6 @@ trusted_certificates:
   fingerprint: c3846bf24b9e93ca64274c0ec67c1ecc5e024ffcacd2d74019350e81fe546ae4
 - subject_name: Go Daddy Root Certificate Authority - G2
   fingerprint: 45140b3247eb9cc8c5b4f0d7b53091f73292089e6e5a63e2749dd3aca9198eda
-- subject_name: Government Root Certification Authority
-  fingerprint: 70b922bfda0e3f4a342e4ee22d579ae598d071cc5ec9c30f123680340388aea5
-- subject_name: Government Root Certification Authority
-  fingerprint: 7600295eefe85b9e1fd624db76062aaaae59818a54d2774cd4c0b2c01131e1b3
 - subject_name: HARICA Client ECC Root CA 2021
   fingerprint: 8dd4b5373cb0de36769c12339280d82746b3aa6cd426e797a31babe4279cf00b
 - subject_name: HARICA Client RSA Root CA 2021
@@ -345,12 +325,6 @@ trusted_certificates:
   fingerprint: eb7e05aa58e7bd328a282bf8867033f3c035342b516ee85c01673dffffbbfe58
 - subject_name: Netrust Root CA 2
   fingerprint: 65353833cf234c79562164f90849c0d104dbabf8ee41064d83e8cbe03ba1c5a5
-- subject_name: Network Solutions Certificate Authority
-  fingerprint: 001686cd181f83a1b1217d305b365c41e3470a78a1d37b134a98cd547b92dab3
-- subject_name: Network Solutions ECC Certificate Authority
-  fingerprint: 2193cfea381211a1aeaa2de984e630643a87160b1208118145eafb8e1bc69958
-- subject_name: Network Solutions RSA Certificate Authority
-  fingerprint: ddbf149733bc2bf8a09d7f012b01a6dea11d7bae26713783ef6407a2495bf189
 - subject_name: Notarius Root Certificate Authority
   fingerprint: aaa15bddb1c924ad7a7f22f89e5cd3e2c61407a064e011b7cf4cb618716449a4
 - subject_name: Notarius Root Certificate Authority
@@ -427,8 +401,6 @@ trusted_certificates:
   fingerprint: 6ec6614e9a8efd47d6318ffdfd0bf65b493a141f77c38d0b319be1bbbc053dd2
 - subject_name: SwissSign Gold CA - G2
   fingerprint: 62dd0be9b9f50a163ea0f8e75c053b1eca57ea55c8688f647c6881f2c8357b95
-- subject_name: SwissSign Platinum CA - G2
-  fingerprint: 3b222e566711e992300dc0b15ab9473dafdef8c84d0cef7d3317b4c1821d1436
 - subject_name: SwissSign Silver CA - G2
   fingerprint: be6c4da2bbb9ba59b6f3939768374246c3c005993fa98f020d1dedbed48a81d5
 - subject_name: Symantec Class 1 Public Primary Certification Authority - G6
@@ -489,8 +461,6 @@ trusted_certificates:
   fingerprint: e6be68ce06fe0da0c140f1aeb00b67b636c5eea9422088929362375ce086db39
 - subject_name: Visa Public RSA Root CA
   fingerprint: 07cd9aa9064a9b94c6aef8fb784c1bbc1beda08acbe86878d781a39167626cf8
-- subject_name: Visa eCommerce Root
-  fingerprint: 69fac9bd55fb0ac78d53bbee5cf1d597989fd0aaab20a25151bdf1733ee7d122
 - subject_name: XRamp Global Certification Authority
   fingerprint: cecddc905099d8dadfc5b1d209b737cbe2c18cfb2c10c0ff0bcf0d3286fc1aa2
 - subject_name: ZETES TSP ROOT CA 001
@@ -517,7 +487,7 @@ trusted_certificates:
   fingerprint: 40f6af0346a99aa1cd1d555a4e9cce62c7f9634603ee406615833dc8c8d00367
 - subject_name: emSign Root CA - G2
   fingerprint: 1aa0c2709e831bd6e3b5129a00ba41f7eeef020872f1e6504bf0f6c3f24f3af3
-blocked_certificates_count: 191
+blocked_certificates_count: 206
 blocked_certificates:
 - subject_name: A-Trust-Qual-02
   fingerprint: f28630babf256e567b5821069fcf13148ab9a23e28fc0d70615aae6ed284f4c8
@@ -589,14 +559,20 @@ blocked_certificates:
   fingerprint: 1e910b40c08184c0ca20468e824502ff2485163f77b03bb73296823f03885621
 - subject_name: CA DATEV BT 02
   fingerprint: 81c2568503eb3be5eec366653960e6d1be9448915e4605b793fbeb34ccb2470f
+- subject_name: CA DATEV BT 03
+  fingerprint: 0c0b6b2bd1edd7b27fead157f8e846b335b784a39f06c47216c8746f64c5ceda
 - subject_name: CA DATEV INT 01
   fingerprint: efb5157e9c66caa1dcc63c9fac0127cde83b7a426c4579b7b43a41ba46a56deb
 - subject_name: CA DATEV INT 02
   fingerprint: 997e15c5a4481a8598499753971ee2601d1047c3635aff21af4221a817fd2d96
+- subject_name: CA DATEV INT 03
+  fingerprint: 8ba1bd9c88efb3947e60ebe21137f81df7f09994cef27f097055018b8194c634
 - subject_name: CA DATEV STD 01
   fingerprint: 1ba622b36325544ae922afc22ef9d367943794f6e16874f368a733c65c9d5279
 - subject_name: CA DATEV STD 02
   fingerprint: 05d38c2a70bfc500ccb0cb509159b46b065c6ac9cb42d2e6f16167841434572a
+- subject_name: CA DATEV STD 03
+  fingerprint: 54ae8a683fe2d78ff1ef0e0b3f58425092953ba08c67fe4a95595d1cebcdcb30
 - subject_name: CA Disig
   fingerprint: 92bf5119abeccad0b1332dc4e1d05fba75b5679044ee0ca26e931f744f2f33cf
 - subject_name: CA Disig Root R1
@@ -609,6 +585,8 @@ blocked_certificates:
   fingerprint: 2d66a702ae81ba03af8cff55ab318afa919039d9f31b4d64388680f81311b65a
 - subject_name: CFCA GT CA
   fingerprint: 0771920c8cb874d5c5a4dc0d6a51a2d495d38c4de2cd5b83d2a06faa051935f6
+- subject_name: CISRCA1
+  fingerprint: 12ff248372bd87e44ece432198be9b04525f33dee00356fd646f8acc01412f86
 - subject_name: CNNIC ROOT
   fingerprint: e28393773da845a679f2080cc7fb44a3b7a1c3792cb7eb7729fdcb6a8d99aea7
 - subject_name: Certeurope Root CA 2
@@ -661,10 +639,14 @@ blocked_certificates:
   fingerprint: cd201256fe5ced0bfff8df595fff36b1416d5313a999f532ef4a9915df96dee0
 - subject_name: Correo Uruguayo - Root CA
   fingerprint: 46273285615d96e52da9fc2ed8c036f10af3d9f6280f8d288706c52b2011b4da
+- subject_name: Cybertrust Global Root
+  fingerprint: 960adf0063e96356750c2965dd0a0867da0b9cbd6e77714aeafb2349ab393da3
 - subject_name: D-TRUST Root Class 2 CA 2007
   fingerprint: 8da75f1327217c88060fd2529eff2816e50b0c74541ea4ea3dfcee66a71efe09
 - subject_name: D-TRUST Root Class 3 CA 2007
   fingerprint: 90f3e05396995ff20922c44592db62d7845e1bf64aef512cca75bc669caa2479
+- subject_name: DST Root CA X3
+  fingerprint: 0687260331a72403d909f105e69bcf0d32e1bd2493ffc6d9206d11bcd6770739
 - subject_name: Deutsche Telekom Root CA 2
   fingerprint: b6191a50d0c3977f7da99bcdaac86a227daeb9679ec70ba3b0c9d92271c170d3
 - subject_name: Digidentity L3 Root CA - G2
@@ -683,8 +665,6 @@ blocked_certificates:
   fingerprint: 08297a4047dba23680c731db6e317653ca7848e1bebd3a0b0179a707f92cf178
 - subject_name: Equifax Secure Global eBusiness CA-1
   fingerprint: 5f0b62eab5e353ea6521651658fbb65359f443280a4afbd104d77d10f9f04c07
-- subject_name: FNMT Clase 2 CA
-  fingerprint: 62b9267266212832a8e22dab933d91c7011274acf71703f9cc97833751a6e94f
 - subject_name: GTE CyberTrust Global Root
   fingerprint: a53125188d2110aa964b02c7b7c6da3203170894e5fb71fffb6667d5e6810a36
 - subject_name: GeoTrust Global CA
@@ -697,8 +677,18 @@ blocked_certificates:
   fingerprint: 5edb7ac43b82a06a8761e8d7be4979ebf2611f7dd79bf91c1c6b566a219ed766
 - subject_name: GeoTrust Primary Certification Authority - G3
   fingerprint: b478b812250df878635c2aa7ec7d155eaa625ee82916e2cd294361886cd1fbd4
+- subject_name: GeoTrust Universal CA
+  fingerprint: a0459b9f63b22559f5fa5d4c6db3f9f72ff19342033578f073bf1d1b46cbb912
 - subject_name: GeoTrust Universal CA 2
   fingerprint: a0234f3bc8527ca5628eec81ad5d69895da5680dc91d1cb8477f33f878b95b0b
+- subject_name: Global Chambersign Root
+  fingerprint: ef3cb417fc8ebf6f97876c9e4ece39de1ea5fe649141d1028b7d11c0b2298ced
+- subject_name: GlobalSign
+  fingerprint: ca42dd41745fd0b81eb902362cf9d8bf719da1bd1b1efc946f5b4c99f42c1b9e
+- subject_name: Government Root Certification Authority
+  fingerprint: 70b922bfda0e3f4a342e4ee22d579ae598d071cc5ec9c30f123680340388aea5
+- subject_name: Government Root Certification Authority
+  fingerprint: 7600295eefe85b9e1fd624db76062aaaae59818a54d2774cd4c0b2c01131e1b3
 - subject_name: Halcom CA FO
   fingerprint: 5a1b5d6bc65523b40a6deffa45b48e4288ae8dd86dd70a5b858d4a5affc94f71
 - subject_name: Halcom CA PO 2
@@ -745,6 +735,12 @@ blocked_certificates:
   fingerprint: e606ddeee2ee7f5cdef5d9058ff8b7d0a9f042877f6a171ed8ff6960e4cc5ea5
 - subject_name: Netrust CA1
   fingerprint: 781d64dfa77b00f2c006700b1fda86bf68b865a603c7a656f92e90c042ca2873
+- subject_name: Network Solutions Certificate Authority
+  fingerprint: 001686cd181f83a1b1217d305b365c41e3470a78a1d37b134a98cd547b92dab3
+- subject_name: Network Solutions ECC Certificate Authority
+  fingerprint: 2193cfea381211a1aeaa2de984e630643a87160b1208118145eafb8e1bc69958
+- subject_name: Network Solutions RSA Certificate Authority
+  fingerprint: ddbf149733bc2bf8a09d7f012b01a6dea11d7bae26713783ef6407a2495bf189
 - subject_name: OpenTrust Root CA G2
   fingerprint: 27995829fe6a7515c1bfe848f9c4761db16c225929257bf40d0894f29ea8baf2
 - subject_name: OpenTrust Root CA G3
@@ -817,6 +813,8 @@ blocked_certificates:
   fingerprint: 958abbaeff760f4fbf66ff0f2c2708f4739b2c686127239a2c4ec87a68a984c8
 - subject_name: SwissSign Gold Root CA - G3
   fingerprint: 7af6ea9f753a1e709bd64d0beb867c11e8c295a56e24a6e0471459dccdaa1558
+- subject_name: SwissSign Platinum CA - G2
+  fingerprint: 3b222e566711e992300dc0b15ab9473dafdef8c84d0cef7d3317b4c1821d1436
 - subject_name: SwissSign Platinum Root CA - G3
   fingerprint: 59b3829f1ff443344958fae8bff621b684c848cfbf7ead6b63a6ca50f2794f89
 - subject_name: SwissSign Silver Root CA - G3
@@ -889,6 +887,8 @@ blocked_certificates:
   fingerprint: ac1fae74b4e97106092131f2e7f746b6734386742bdfd8423731aed14a4ce446
 - subject_name: VeriSign, Inc.
   fingerprint: 5b789987f3c4055b8700941b33783a5f16e0cff937ea32011fe04779f7635308
+- subject_name: Visa eCommerce Root
+  fingerprint: 69fac9bd55fb0ac78d53bbee5cf1d597989fd0aaab20a25151bdf1733ee7d122
 - subject_name: e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi
   fingerprint: e609078465a419780cb6ac4c1c0bfb4653d9d9cc6eb3946eb7f3d69997bad598
 - subject_name: esignit.org