From 89826bc90adfe1ae8390caf689581c1f58bc44f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juhani=20Krekel=C3=A4?= <juhani@krekelä.fi>
Date: Sun, 5 Jan 2020 14:44:52 +0200
Subject: [PATCH] Organize the file into sections

---
 kishib.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/kishib.py b/kishib.py
index 9f253a6..674ddac 100644
--- a/kishib.py
+++ b/kishib.py
@@ -11,6 +11,10 @@ def error(*args):
 	print('%s: Error:' % os.path.basename(sys.argv[0]), *args, file = sys.stderr)
 	sys.exit(1)
 
+# ------------------------------------------------------------------
+# Client - server communication
+# ------------------------------------------------------------------
+
 def enc_len(length):
 	assert 0 <= length < 1<<16
 	high_byte = length >> 8
@@ -104,6 +108,10 @@ def client(client_pubkey, host, port):
 
 	return bytes(server_pubkey)
 
+# ------------------------------------------------------------------
+# Hash
+# ------------------------------------------------------------------
+
 def sha512(x):
 	h = hashlib.sha512()
 	h.update(x)
@@ -168,6 +176,17 @@ def parse_hash(auth_hash):
 
 	return binary
 
+# ------------------------------------------------------------------
+# UI
+# ------------------------------------------------------------------
+
+def usage(part = None):
+	if part == 'client' or part is None:
+		print('Usage: %s client [-p <port>] <host>' % os.path.basename(sys.argv[0]), file = sys.stderr)
+	if part =='server' or part is None:
+		print('Usage: %s server [-p <port>]' % os.path.basename(sys.argv[0]), file = sys.stderr)
+	sys.exit(1)
+
 def verify(client_pubkey, server_pubkey):
 	own_hash = auth_hash(client_pubkey, server_pubkey)
 	print('Authentication hash: %s' % format_hash(own_hash))
@@ -197,13 +216,6 @@ def verify(client_pubkey, server_pubkey):
 			else:
 				error('Could not transfer the keys')
 
-def usage(part = None):
-	if part == 'client' or part is None:
-		print('Usage: %s client [-p <port>] <host>' % os.path.basename(sys.argv[0]), file = sys.stderr)
-	if part =='server' or part is None:
-		print('Usage: %s server [-p <port>]' % os.path.basename(sys.argv[0]), file = sys.stderr)
-	sys.exit(1)
-
 def main():
 	# TODO: Read pubkeys from files
 	# TODO: Write pubkeys to files