Skip to content

Hash IDs for better serialization #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
warner merged 1 commit into from
Jan 16, 2016
Merged

Hash IDs for better serialization #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions spake2/spake2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ class ReflectionThwarted(SPAKEError):
# Y = scalarmult(g, y)
# Y* = Y + scalarmult(N, int(pw))
# KA = scalarmult(Y* + scalarmult(N, -int(pw)), x)
# key = H(idA, idB, X*, Y*, KA)
# key = H(H(idA), H(idB), X*, Y*, KA)
# KB = scalarmult(X* + scalarmult(M, -int(pw)), y)
# key = H(idA, idB, X*, Y*, KB)
# key = H(H(idA), H(idB), X*, Y*, KB)

# to serialize intermediate state, just remember x and A-vs-B. And U/V.

Expand Down Expand Up @@ -152,9 +152,9 @@ def _extract_message(self, inbound_side_and_message):
return inbound_message

def _make_transcript(self, K_bytes):
return b":".join([self.idA, self.idB,
self.X_msg(), self.Y_msg(), K_bytes,
self.pw])
return b"".join([sha256(self.idA).digest(), sha256(self.idB).digest(),
self.X_msg(), self.Y_msg(), K_bytes,
self.pw])

def _serialize_to_dict(self):
g = self.params.group
Expand Down Expand Up @@ -231,9 +231,9 @@ def _make_transcript(self, K_bytes):
# since we don't know which side is which, we must sort the messages
first_msg, second_msg = sorted([self.inbound_message,
self.outbound_message])
return b":".join([self.idSymmetric,
first_msg, second_msg, K_bytes,
self.pw])
return b"".join([sha256(self.idSymmetric).digest(),
first_msg, second_msg, K_bytes,
self.pw])

def hash_params(self):
g = self.params.group
Expand Down