Version 0.53. See CHANGELOG.md

TheScriptGuy · Nov 6, 2023 · 4998e2e · 4998e2e
1 parent ef0fc4a
commit 4998e2e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2023/11/05
+## Version 0.53
+* Fixed an issue with the mechanism behind getting the SSL certificate chain.
+
 # 2023/10/14
 ## Version 0.52
 ### Fixes

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Certificate Checker
 
-Version: 0.52
+Version: 0.53
 
 Author: TheScriptGuy
 
@@ -30,7 +30,7 @@ usage: certCheck.py [-h] [--hostname HOSTNAME] [--displayCertificate] [--display
                     [--sendEmail] [--retryAmount RETRYAMOUNT] [--timeBetweenRetries TIMEBETWEENRETRIES] [--contextVariables] [--environmentVariables] [--setTag SETTAG] [--delTag] [--getTag] [--renewDeviceId]
                     [--getDeviceId] [--deleteDeviceId] [--setTenantId SETTENANTID] [--getTenantId] [--delTenantId] [--createBlankConfiguration]
 
-Certificate Checker v0.52
+Certificate Checker v0.53
 
 optional arguments:
   -h, --help            show this help message and exit

diff --git a/certCheck.py b/certCheck.py
@@ -1,7 +1,7 @@
 # Program:        Certificate Checker
 # Author:         Nolan Rumble
-# Date:           2023/10/14
-# Version:        0.52
+# Date:           2023/11/05
+# Version:        0.53
 
 import argparse
 import datetime
@@ -18,7 +18,7 @@
 from data import sendDataEmail
 from mongo import mongo_connection
 
-scriptVersion = "0.52"
+scriptVersion = "0.53"
 
 # Global Variables
 args = None

diff --git a/certificate/getCertificateChain.py b/certificate/getCertificateChain.py
@@ -1,7 +1,7 @@
 # Description:     Get the certificate chain from a website.
 # Author:          TheScriptGuy
-# Last modified:   2023-08-13
-# Version:         0.05
+# Last modified:   2023-11-05
+# Version:         0.06
 
 import ssl
 import socket
@@ -86,8 +86,7 @@ def getCertificate(
             # Create the SSL context.
             # We will ignore any certificate warnings for this process.
             sslContext = ssl._create_unverified_context()
-            sslContext.options &= ~ssl.OP_NO_RENEGOTIATION
-
+            sslContext.options |= 0x4  # OP_LEGACY_SERVER_CONNECT
             with socket.create_connection((__hostname, __port)) as sock, sslContext.wrap_socket(sock, server_hostname=__hostname) as sslSocket:
                 # Get the certificate from the connection, convert it to PEM format.
                 sslCertificate = ssl.DER_cert_to_PEM_cert(sslSocket.getpeercert(True))
@@ -98,6 +97,8 @@ def getCertificate(
         except ConnectionRefusedError:
             print(f"Connection refused to {__hostname}:{__port}")
             sys.exit(1)
+        except ssl.SSLError as e:
+            print(f"SSL Error - {e}")
 
         # Return the sslCertificate object.
         return sslCertificate
@@ -299,7 +300,7 @@ def getCertificateChain(self, __hostname: str, __port: int):
 
     def __init__(self):
         """Init the getCertChain class."""
-        self.classVersion = "0.05"
+        self.classVersion = "0.06"
         self.maxDepth = 4
         self.certChain = []
         self.certificateHash = ""