diff options
author | Jim Shaver <dcypherd@gmail.com> | 2015-04-30 08:26:29 -0400 |
---|---|---|
committer | Jim Shaver <dcypherd@gmail.com> | 2015-04-30 08:26:29 -0400 |
commit | b2ff5bedccc666469d6456509cd6936e32b3b773 (patch) | |
tree | 0ee0d7d6f1967ba8c8f4636f184f479b09f889f3 | |
parent | 4852ef49298dbb4c477b61f2940f497ab34adbe9 (diff) | |
download | pyopenssl-b2ff5bedccc666469d6456509cd6936e32b3b773.tar.gz |
switched to identifying certificate by CN instead of ugly suject. Minor cleanup
-rw-r--r-- | examples/simple/client.py | 8 | ||||
-rw-r--r-- | examples/simple/server.py | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/examples/simple/client.py b/examples/simple/client.py index aa591ca..a9a0eff 100644 --- a/examples/simple/client.py +++ b/examples/simple/client.py @@ -8,12 +8,14 @@ Simple SSL client, using blocking I/O """ -from OpenSSL import SSL +from OpenSSL import SSL, crypto import sys, os, select, socket def verify_cb(conn, cert, errnum, depth, ok): # This obviously has to be updated - print('Got certificate: %s' % cert.get_subject()) + certsubject = crypto.X509Name(cert.get_subject()) + commonname = certsubject.commonName + print('Got certificate: ' + commonname) return ok if len(sys.argv) < 3: @@ -41,7 +43,7 @@ while 1: break try: sock.send(line) - sys.stdout.write(sock.recv(1024)) + sys.stdout.write(sock.recv(1024).decode('utf-8')) sys.stdout.flush() except SSL.Error: print('Connection died unexpectedly') diff --git a/examples/simple/server.py b/examples/simple/server.py index 97e18a7..f07cfc2 100644 --- a/examples/simple/server.py +++ b/examples/simple/server.py @@ -8,13 +8,15 @@ Simple echo server, using nonblocking I/O """ -from OpenSSL import SSL +from OpenSSL import SSL, crypto import sys, os, select, socket def verify_cb(conn, cert, errnum, depth, ok): # This obviously has to be updated - print('Got certificate: %s' % cert.get_subject()) + certsubject = crypto.X509Name(cert.get_subject()) + commonname = certsubject.commonName + print(('Got certificate: ' + commonname)) return ok if len(sys.argv) < 2: @@ -57,7 +59,7 @@ def dropClient(cli, errors=None): while 1: try: - r, w, _ = select.select([server]+clients.keys(), writers.keys(), []) + r, w, _ = select.select([server] + list(clients.keys()), list(writers.keys()), []) except: break @@ -69,7 +71,7 @@ while 1: else: try: - ret = cli.recv(1024) + ret = cli.recv(1024).decode('utf-8') except (SSL.WantReadError, SSL.WantWriteError, SSL.WantX509LookupError): pass except SSL.ZeroReturnError: |