# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1592922357 -28800
# Node ID 01fb08c43b85b1e0f81aff93d0505d2f66692a77
# Parent  57f85129670f24024928583ced797befcade072f# Parent  93dcc97c3f3fc4b858068b4ce515d612b59d6cb3
merge

diff -r 57f85129670f -r 01fb08c43b85 ed25519.c
--- a/ed25519.c	Tue Jun 23 22:24:58 2020 +0800
+++ b/ed25519.c	Tue Jun 23 22:25:57 2020 +0800
@@ -84,7 +84,7 @@
 	memcpy(key->pub, buf_getptr(buf, CURVE25519_LEN), CURVE25519_LEN);
 	buf_incrpos(buf, CURVE25519_LEN);
 
-	TRACE(("leave buf_get_ed25519_pub_key: success"))
+	TRACE(("leave buf_get_ed25519_priv_key: success"))
 	return DROPBEAR_SUCCESS;
 }
 
@@ -100,7 +100,7 @@
 	m_burn(key->priv, CURVE25519_LEN);
 	m_free(key);
 
-	TRACE2(("leave rsa_key_free"))
+	TRACE2(("leave ed25519_key_free"))
 }
 
 /* Put the public ed25519 key into the buffer in the required format */
@@ -160,7 +160,7 @@
 
 	slen = buf_getint(buf);
 	if (slen != 64 || buf->len - buf->pos < slen) {
-		TRACE(("bad size"))
+		TRACE(("leave buf_ed25519_verify: bad size"))
 		goto out;
 	}
 	s = buf_getptr(buf, slen);
@@ -168,7 +168,7 @@
 	if (dropbear_ed25519_verify(data_buf->data, data_buf->len,
 				    s, slen, key->pub) == 0) {
 		/* signature is valid */
-		TRACE(("success!"))
+		TRACE(("leave buf_ed25519_verify: success!"))
 		ret = DROPBEAR_SUCCESS;
 	}