Merge pull request #635 from tlsfuzzer/unicode-bytes

fix py2/py3 compat with Unicode inputs
tlsfuzzer · Apr 16, 2021 · 4fd9acc · 4fd9acc
2 parents c7d8739 + dfe0e87
commit 4fd9acc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/scripts/test-tls13-post-handshake-auth.py b/scripts/test-tls13-post-handshake-auth.py
@@ -32,6 +32,7 @@
 from tlslite.x509certchain import X509CertChain
 from tlslite.x509 import X509
 from tlslite.utils.keyfactory import parsePEMKey
+from tlslite.utils.compat import compatAscii2Bytes
 
 
 version = 3
@@ -116,7 +117,7 @@ def main():
         elif opt == '--cert-required':
             cert_required = True
         elif opt == '--query':
-            pha_query = arg
+            pha_query = compatAscii2Bytes(arg)
         elif opt == '--min-tickets':
             min_tickets = int(arg)
         elif opt == '-k':

diff --git a/tests/tlslite-ng-random-subset.json b/tests/tlslite-ng-random-subset.json
@@ -313,7 +313,8 @@
          {"name" : "test-tls13-post-handshake-auth.py",
           "arguments" : ["-k", "tests/clientX509Key.pem",
                          "-c", "tests/clientX509Cert.pem",
-                         "--pha-as-reply"]
+                         "--pha-as-reply",
+                         "--query", "GET /secret HTTP/1.0\r\n\r\n"]
           },
          {"name" : "test-tls13-record-layer-limits.py"},
          {"name" : "test-tls13-record-padding.py"},