From 2e91aafa864064bd4c77a8c8ab451e5268c58795 Mon Sep 17 00:00:00 2001 From: Seth Schoen Date: Tue, 3 Jul 2012 01:45:14 -0700 Subject: [PATCH] now successfully gets challenge data from server --- client-webserver/client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client-webserver/client.py b/client-webserver/client.py index 62c50990d..30e2bea29 100644 --- a/client-webserver/client.py +++ b/client-webserver/client.py @@ -19,7 +19,7 @@ def do(m): return u.read() def decode(m): - return str(chocolatemessage.FromString(m)) + return (chocolatemessage.FromString(m)) def init(m): m.chocolateversion = 1 @@ -35,5 +35,5 @@ def make_request(m): def sign(k, m): m.request.sig = CSR.sign(k, sha256("(%d) (%s) (%s)" % (m.request.timestamp, m.request.recipient, m.request.csr))) -m = chocolatemessage() +k=chocolatemessage(); m=chocolatemessage(); init(k); init(m); make_request(m); m.request.csr = open("req.pem").read(); sign(open("key.pem").read(), m); r=decode(do(m)); print (r); k.session = r.session; print decode(do(k))