wire-mix: instead of checking op string, check if writer implements h…

…ash.Hash

wire/common.go

@@ -845,7 +845,8 @@ func isStrictAscii(s string) bool {
 	return true
 }
 
-// hashEncoder specifies a message encoder that will never error on its own
+// hashEncoder specifies a writer for message and signature hashes which never
+// errors.
 type hashEncoder interface {
 	hashEncode(h hash.Hash, pver uint32)
 }

wire/msgmixciphertexts.go

@@ -106,11 +106,10 @@ func (msg *MsgMixCiphertexts) hashEncode(h hash.Hash, pver uint32) {
 // the signature.  This allows code reuse between message serialization, and
 // signing and verifying these message contents.
 //
-// If op is the empty string (when the message is being hashed), w is a
-// hash.Hash (writes never error) and no errors will be returned for invalid
-// message construction.
+// If w implements hash.Hash, no errors will be returned for invalid message
+// construction.
 func (msg *MsgMixCiphertexts) writeMessageNoSignature(op string, w io.Writer, pver uint32) error {
-	hashing := op == ""
+	_, hashing := w.(hash.Hash)
 
 	err := writeElements(w, &msg.Identity, &msg.SessionID, msg.Expiry,
 		msg.Run)

wire/msgmixconfirm.go

@@ -104,11 +104,10 @@ func (msg *MsgMixConfirm) hashEncode(h hash.Hash, pver uint32) {
 // the signature.  This allows code reuse between message serialization, and
 // signing and verifying these message contents.
 //
-// If op is the empty string (when the message is being hashed), w is a
-// hash.Hash (writes never error) and no errors will be returned for invalid
-// message construction.
+// If w implements hash.Hash, no errors will be returned for invalid message
+// construction.
 func (msg *MsgMixConfirm) writeMessageNoSignature(op string, w io.Writer, pver uint32) error {
-	hashing := op == ""
+	_, hashing := w.(hash.Hash)
 
 	err := writeElements(w, &msg.Identity, &msg.SessionID, msg.Expiry,
 		msg.Run)

wire/msgmixdcnet.go

@@ -113,11 +113,10 @@ func (msg *MsgMixDCNet) hashEncode(h hash.Hash, pver uint32) {
 // the signature.  This allows code reuse between message serialization, and
 // signing and verifying these message contents.
 //
-// If op is the empty string (when the message is being hashed), w is a
-// hash.Hash (writes never error) and no errors will be returned for invalid
-// message construction.
+// If w implements hash.Hash, no errors will be returned for invalid message
+// construction.
 func (msg *MsgMixDCNet) writeMessageNoSignature(op string, w io.Writer, pver uint32) error {
-	hashing := op == ""
+	_, hashing := w.(hash.Hash)
 
 	err := writeElements(w, &msg.Identity, &msg.SessionID, msg.Expiry,
 		msg.Run)

wire/msgmixkeyexchange.go

@@ -105,11 +105,10 @@ func (msg *MsgMixKeyExchange) hashEncode(h hash.Hash, pver uint32) {
 // the signature.  This allows code reuse between message serialization, and
 // signing and verifying these message contents.
 //
-// If op is the empty string (when the message is being hashed), w is a
-// hash.Hash (writes never error) and no errors will be returned for invalid
-// message construction.
+// If w implements hash.Hash, no errors will be returned for invalid message
+// construction.
 func (msg *MsgMixKeyExchange) writeMessageNoSignature(op string, w io.Writer, pver uint32) error {
-	hashing := op == ""
+	_, hashing := w.(hash.Hash)
 
 	err := writeElements(w, &msg.Identity, &msg.SessionID, msg.Expiry,
 		msg.Run, &msg.ECDH, &msg.PQPK, &msg.Commitment)

wire/msgmixpairreq.go

@@ -213,11 +213,10 @@ func (msg *MsgMixPairReq) hashEncode(h hash.Hash, pver uint32) {
 // the signature.  This allows code reuse between message serialization, and
 // signing and verifying these message contents.
 //
-// If op is the empty string (when the message is being hashed), w is a
-// hash.Hash (writes never error) and no errors will be returned for invalid
-// message construction.
+// If w implements hash.Hash, no errors will be returned for invalid message
+// construction.
 func (msg *MsgMixPairReq) writeMessageNoSignature(op string, w io.Writer, pver uint32) error {
-	hashing := op == ""
+	_, hashing := w.(hash.Hash)
 
 	err := writeElements(w, &msg.Identity, msg.Expiry, msg.MixAmount)
 	if err != nil {

wire/msgmixsecrets.go

@@ -118,9 +118,7 @@ func (msg *MsgMixSecrets) hashEncode(h hash.Hash, pver uint32) {
 // the signature.  This allows code reuse between message serialization, and
 // signing and verifying these message contents.
 //
-// If op is the empty string (when the message is being hashed), w is a
-// hash.Hash (writes never error) and no errors will be returned for invalid
-// message construction.
+// This method never errors for invalid message construction.
 func (msg *MsgMixSecrets) writeMessageNoSignature(op string, w io.Writer, pver uint32) error {
 	err := writeElements(w, &msg.Identity, &msg.SessionID, msg.Expiry,
 		msg.Run, &msg.Seed)

wire/msgmixslotreserve.go

@@ -150,11 +150,10 @@ func (msg *MsgMixSlotReserve) hashEncode(h hash.Hash, pver uint32) {
 // the signature.  This allows code reuse between message serialization, and
 // signing and verifying these message contents.
 //
-// If op is the empty string (when the message is being hashed), w is a
-// hash.Hash (writes never error) and no errors will be returned for invalid
-// message construction.
+// If w implements hash.Hash, no errors will be returned for invalid message
+// construction.
 func (msg *MsgMixSlotReserve) writeMessageNoSignature(op string, w io.Writer, pver uint32) error {
-	hashing := op == ""
+	_, hashing := w.(hash.Hash)
 
 	err := writeElements(w, &msg.Identity, &msg.SessionID, msg.Expiry,
 		msg.Run)