diff --git a/sshhmac.c b/sshhmac.c
index 29db9fbf..2f870f36 100644
--- a/sshhmac.c
+++ b/sshhmac.c
@@ -222,7 +222,7 @@ const ssh2_macalg ssh_hmac_sha1_96 = {
 };
 
 const struct hmac_extra ssh_hmac_sha1_buggy_extra = {
-    &ssh_sha1, " (bug-compatible)"
+    &ssh_sha1, "", "bug-compatible"
 };
 
 const ssh2_macalg ssh_hmac_sha1_buggy = {
@@ -233,7 +233,7 @@ const ssh2_macalg ssh_hmac_sha1_buggy = {
 };
 
 const struct hmac_extra ssh_hmac_sha1_96_buggy_extra = {
-    &ssh_sha1, "-96 (bug-compatible)"
+    &ssh_sha1, "-96", "bug-compatible"
 };
 
 const ssh2_macalg ssh_hmac_sha1_96_buggy = {
diff --git a/testcrypt.h b/testcrypt.h
index 98a1daf0..690bfa2b 100644
--- a/testcrypt.h
+++ b/testcrypt.h
@@ -136,6 +136,7 @@ FUNC2(void, ssh2_mac_setkey, val_mac, val_string_ptrlen)
 FUNC1(void, ssh2_mac_start, val_mac)
 FUNC2(void, ssh2_mac_update, val_mac, val_string_ptrlen)
 FUNC1(val_string, ssh2_mac_genresult, val_mac)
+FUNC1(val_string_asciz_const, ssh2_mac_text_name, val_mac)
 
 /*
  * The ssh_key abstraction. All the uses of BinarySink and