Organize the file into sections

This commit is contained in:
Juhani Krekelä 2020-01-05 14:44:52 +02:00
parent 7c50328c4f
commit 89826bc90a
1 changed files with 19 additions and 7 deletions

View File

@ -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