Skip to content

chore(dhgex): log group size and timing #375

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
kruton merged 1 commit into from
Oct 25, 2026
Merged

chore(dhgex): log group size and timing #375

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
30 changes: 20 additions & 10 deletions sshlib/src/main/kotlin/org/connectbot/sshlib/client/SshConnection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,9 +1054,9 @@
}
}
when (result) {
is InternalAuthResult.Success -> return PublicAuthResult.Success

Check warning on line 1057 in sshlib/src/main/kotlin/org/connectbot/sshlib/client/SshConnection.kt

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this useless is check. 


See more on https://sonarcloud.io/project/issues?id=connectbot_cbssh&issues=AaFxpm5mY4cSrRUGvC1R&open=AaFxpm5mY4cSrRUGvC1R&pullRequest=375

is InternalAuthResult.Failure -> {

Check warning on line 1059 in sshlib/src/main/kotlin/org/connectbot/sshlib/client/SshConnection.kt

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this useless is check. 


See more on https://sonarcloud.io/project/issues?id=connectbot_cbssh&issues=AaFxpm5mY4cSrRUGvC1S&open=AaFxpm5mY4cSrRUGvC1S&pullRequest=375
allowedAuthentications = result.allowedMethods
if (result.partialSuccess) {
// Previously rejected keys can become valid for the next factor,
Expand Down Expand Up @@ -1451,10 +1451,15 @@
}

private suspend fun sendKexDhGexRequest(kexEntry: KexEntry) {
logger.debug("Sending DH_GEX_REQUEST (${kexEntry.sshName})")

val dhGex = DiffieHellmanGroupExchange(kexEntry.hashAlgorithm, cryptoPolicy?.minimumDhBits ?: 2048)
kex = dhGex
logger.info(
"Sending DH_GEX_REQUEST ({}): {}/{}/{} bits",
kexEntry.sshName,
dhGex.min,
dhGex.n,
dhGex.max,
)

val msg = SshMsgKexDhGexRequest().apply {
setMin(dhGex.min.toLong())
Expand Down Expand Up @@ -1495,17 +1500,22 @@
val group = dhGexGroup ?: throw SshException("DH-GEX group not received")
val dhGex = kex as? DiffieHellmanGroupExchange
?: throw SshException("KEX algorithm is not DH-GEX")
logger.debug("DH-GEX group received; validating group")
val validationStartedAt = System.nanoTime()
dhGex.setGroup(
BigInteger(1, group.p().body()),
BigInteger(1, group.g().body()),
val p = BigInteger(1, group.p().body())
val g = BigInteger(1, group.g().body())
val q = p.subtract(BigInteger.ONE).shiftRight(1)
logger.info(
"DH-GEX group received: p={} bits, q={} set/{} bits, g={} bits; validating group",
p.bitLength(),
q.bitCount(),
q.bitLength(),
g.bitLength(),
)
logger.debug("DH-GEX group validated in {} ms", (System.nanoTime() - validationStartedAt) / 1_000_000)
logger.debug("Generating DH-GEX client key")
val validationStartedAt = System.nanoTime()
dhGex.setGroup(p, g)
logger.info("DH-GEX group validated in {} ms; generating client key", (System.nanoTime() - validationStartedAt) / 1_000_000)
val keyGenerationStartedAt = System.nanoTime()
clientPublicKey = dhGex.generateClientKeys()
logger.debug("DH-GEX client key generated in {} ms", (System.nanoTime() - keyGenerationStartedAt) / 1_000_000)
logger.info("DH-GEX client key generated in {} ms; sending DH_GEX_INIT", (System.nanoTime() - keyGenerationStartedAt) / 1_000_000)

val initMsg = SshMsgKexDhGexInit().apply {
setE(createMpint(clientPublicKey!!))
Expand Down
Loading