Use len(var) instead of tlv_length for values.

usecallmanagernz · Jun 25, 2024 · 5f5b047 · 5f5b047
1 parent cab0ba1
commit 5f5b047
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/enccnf b/enccnf
@@ -148,7 +148,7 @@ def parse_enc_file(enc_file, tftp_certificate_file):
         elif tlv_tag == HEADER_SIGNATURE:
             signature = tlv_data[tlv_index:tlv_index + tlv_length]
 
-            print(f'Signature:                   {tlv_length} bytes')
+            print(f'Signature:                   {len(signature)} bytes')
 
             signature_index = tlv_index - 3
             signature_length = tlv_length
@@ -171,10 +171,14 @@ def parse_enc_file(enc_file, tftp_certificate_file):
             pass
 
         elif tlv_tag == HEADER_ENCRYPTION_IV:
-            print(f'Encryption IV:               {tlv_length} bytes')
+            encryption_iv = tlv_data[tlv_index:tlv_index + tlv_length]
+
+            print(f'Encryption IV:               {len(encryption_iv)} bytes')
 
         elif tlv_tag == HEADER_ENCRYPTION_KEY:
-            print(f'Encryption Key:              {tlv_length} bytes')
+            encryption_key = tlv_data[tlv_index:tlv_index + tlv_length]
+
+            print(f'Encryption Key:              {len(encryption_key)} bytes')
 
         elif tlv_tag == HEADER_ENCRYPTION_HASH_ALGORITHM:
             encryption_hash_algorithm = tlv_data[tlv_index]

diff --git a/sgnfile b/sgnfile
@@ -133,7 +133,7 @@ def parse_sgn_file(sgn_file, tftp_certificate_file):
         elif tlv_tag == HEADER_SIGNATURE:
             signature = tlv_data[tlv_index:tlv_index + tlv_length]
 
-            print(f'Signature:        {tlv_length} bytes')
+            print(f'Signature:        {len(signature)} bytes')
 
             signature_index = tlv_index - 3
             signature_length = tlv_length

diff --git a/tlvfile b/tlvfile
@@ -163,7 +163,7 @@ def parse_tlv_file(tlv_file):
         elif tlv_tag == HEADER_SIGNATURE:
             signature = tlv_data[tlv_index:tlv_index + tlv_length]
 
-            print(f'Signature:        {tlv_length} bytes')
+            print(f'Signature:        {len(signature)} bytes')
 
             signature_index = tlv_index - 3
             signature_length = tlv_length
@@ -272,17 +272,17 @@ def parse_tlv_file(tlv_file):
             elif tlv_tag == RECORD_PUBLIC_KEY:
                 public_key = tlv_data[tlv_index:tlv_index + tlv_length]
 
-                print(f'Public Key:       {tlv_length} bytes')
+                print(f'Public Key:       {len(public_key)} bytes')
 
             elif tlv_tag == RECORD_SIGNATURE:
                 signature = tlv_data[tlv_index:tlv_index + tlv_length]
 
-                print(f'Signature:        {tlv_length} bytes')
+                print(f'Signature:        {len(signature)} bytes')
 
             elif tlv_tag == RECORD_CERTIFICATE:
                 certificate = tlv_data[tlv_index:tlv_index + tlv_length]
 
-                print(f'Certificate:      {tlv_length} bytes')
+                print(f'Certificate:      {len(certificate)} bytes')
 
                 try:
                     certificate = x509.load_der_x509_certificate(certificate, backends.default_backend())