Merge branch 'master' into zzz-jetty12-2

This commit is contained in:
idk
2025-10-01 12:28:03 -04:00

View File

@@ -804,10 +804,13 @@ public class RatchetSKM extends SessionKeyManager implements SessionTagListener
@Override @Override
public void renderStatusHTML(Writer out) throws IOException { public void renderStatusHTML(Writer out) throws IOException {
StringBuilder buf = new StringBuilder(1024); StringBuilder buf = new StringBuilder(1024);
boolean isPQ = _type != EncType.ECIES_X25519;
// inbound // inbound
buf.append("<h3 class=\"debug_inboundsessions\">Ratchet Inbound sessions</h3>" + buf.append("<h3 class=\"debug_inboundsessions\">");
"<table>"); if (isPQ)
buf.append("PQ ");
buf.append("Ratchet Inbound sessions</h3><table>");
Map<PublicKey, Set<RatchetTagSet>> inboundSets = getRatchetTagSetsByPublicKey(); Map<PublicKey, Set<RatchetTagSet>> inboundSets = getRatchetTagSetsByPublicKey();
int total = 0; int total = 0;
int totalSets = 0; int totalSets = 0;
@@ -853,8 +856,10 @@ public class RatchetSKM extends SessionKeyManager implements SessionTagListener
.append("; sessions: ").append(inboundSets.size()) .append("; sessions: ").append(inboundSets.size())
.append("</th></tr>\n" + .append("</th></tr>\n" +
"</table>" + "</table>" +
"<h3 class=\"debug_outboundsessions\">Ratchet Outbound sessions</h3>" + "<h3 class=\"debug_outboundsessions\">");
"<table>"); if (isPQ)
buf.append("PQ ");
buf.append("Ratchet Outbound sessions</h3><table>");
// outbound // outbound
totalSets = 0; totalSets = 0;