repo: tlsa
action: commit
revision: 
path_from: 
revision_from: 20577f0c920ac924204b4e0044010fe13d86cfbd:
path_to: 
revision_to: 
git.thebackupbox.net
tlsa
git clone git://git.thebackupbox.net/tlsa
commit 20577f0c920ac924204b4e0044010fe13d86cfbd
Author: epoch 
Date:   Wed Aug 31 12:57:44 2022 -0500

    removed some error handling so that it can be handled in caller program instead

diff --git a/tlsa.py b/tlsa.py
index ace36988e3e54286639ca1559165d4a30bec4b28..
index ..e7464364da597dada31a2a46a8d06ae87d32aa3b 100755
--- a/tlsa.py
+++ b/tlsa.py
@@ -285,17 +285,10 @@ class TLSA:

         if not protocol.lower() in ['tcp', 'udp', 'sctp']:
             raise Exception('Error: unknown protocol: %s. Should be one of tcp, udp or sctp' % protocol)
-        try:
-            if port == '*':
-                records = self.getRecords('*._%s.%s' % (protocol.lower(), hostname), rrtype=52, secure=secure)
-            else:
-                records = self.getRecords('_%s._%s.%s' % (port, protocol.lower(), hostname), rrtype=52, secure=secure)
-        except InsecureLookupException as e:
-            print(str(e))
-            sys.exit(1)
-        except DNSLookupError as e:
-            print('Unable to resolve %s: %s' % (hostname, str(e)))
-            sys.exit(1)
+        if port == '*':
+            records = self.getRecords('*._%s.%s' % (protocol.lower(), hostname), rrtype=52, secure=secure)
+        else:
+            records = self.getRecords('_%s._%s.%s' % (port, protocol.lower(), hostname), rrtype=52, secure=secure)
         ret = []
         for record in records:
             hexdata = b2a_hex(record)
@@ -497,7 +490,7 @@ class TLSA:
         return pre_exit

 #--- epoch added this function ----#
-    def connect_verify(self, host, port, protocol="tcp", secure=False, debug=False, ipv4=False, ipv6=False, snihost=""):
+    def connect_verify(self, host, port, protocol="tcp", secure=True, debug=False, ipv4=False, ipv6=False, snihost=""):
         if snihost == "":
             snihost=host
         records = self.getTLSA(host, port, protocol, secure)

-----END OF PAGE-----