more curses status updates

This commit is contained in:
Seth Schoen
2012-08-10 18:06:34 -07:00
parent e884c7f460
commit 5997ac8ddf
+5 -3
View File
@@ -189,10 +189,12 @@ def authenticate():
m=chocolatemessage() m=chocolatemessage()
init(k) init(k)
init(m) init(m)
if curses:
shower.add("Creating request; generating hashcash...\n")
make_request(server, m, csr_pem) make_request(server, m, csr_pem)
sign(key_pem, m) sign(key_pem, m)
if curses: if curses:
shower.add("Created request...\n") shower.add("Created request; sending to server...\n")
else: else:
print m print m
r=decode(do(upstream, m)) r=decode(do(upstream, m))
@@ -260,12 +262,12 @@ def authenticate():
with open(chain_file, "w") as f: with open(chain_file, "w") as f:
f.write(r.success.chain) f.write(r.success.chain)
if curses: if curses:
shower.add("Server issued certificate; certificate written to " + cert_file) shower.add("Server issued certificate; certificate written to %s\n" % cert_file)
else: else:
print "Server issued certificate; certificate written to " + cert_file print "Server issued certificate; certificate written to " + cert_file
if r.success.chain: if r.success.chain:
if curses: if curses:
shower.add("Cert chain written to " + chain_file) shower.add("Cert chain written to %s\n" % chain_file)
else: else:
print "Cert chain written to " + chain_file print "Cert chain written to " + chain_file
# TODO: Uncomment the following assignment when the server # TODO: Uncomment the following assignment when the server