dorkbox/Network
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use ByteArray extension for hex instead

Browse Source
This commit is contained in:
Robinson 2021-08-23 00:48:05 -06:00
parent a75ece2a39
commit 40fb0d8caf
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dorkbox/network/Client.kt
View File

@ -15,6 +15,7 @@
*/ */
package dorkbox.network package dorkbox.network
import dorkbox.bytes.toHexString
import dorkbox.netUtil.* import dorkbox.netUtil.*
import dorkbox.network.aeron.AeronDriver import dorkbox.network.aeron.AeronDriver
import dorkbox.network.aeron.IpcMediaDriverConnection import dorkbox.network.aeron.IpcMediaDriverConnection
@ -27,7 +28,6 @@ import dorkbox.network.exceptions.ClientTimedOutException
import dorkbox.network.handshake.ClientHandshake import dorkbox.network.handshake.ClientHandshake
import dorkbox.network.ping.Ping import dorkbox.network.ping.Ping
import dorkbox.network.ping.PingManager import dorkbox.network.ping.PingManager
import dorkbox.util.Sys
import kotlinx.atomicfu.atomic import kotlinx.atomicfu.atomic
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
@ -463,7 +463,7 @@ open class Client<CONNECTION : Connection>(
throw exception throw exception
} }
logger.info("Adding new signature for ${IP.toString(remoteAddress)} : ${Sys.bytesToHex(connectionInfo.publicKey)}") logger.info("Adding new signature for ${IP.toString(remoteAddress)} : ${connectionInfo.publicKey.toHexString()}")
storage.addRegisteredServerKey(remoteAddress, connectionInfo.publicKey) storage.addRegisteredServerKey(remoteAddress, connectionInfo.publicKey)
} }

8
src/dorkbox/network/connection/CryptoManagement.kt
View File

@ -16,12 +16,12 @@
package dorkbox.network.connection package dorkbox.network.connection
import dorkbox.bytes.Hash import dorkbox.bytes.Hash
import dorkbox.bytes.toHexString
import dorkbox.netUtil.IP import dorkbox.netUtil.IP
import dorkbox.network.handshake.ClientConnectionInfo import dorkbox.network.handshake.ClientConnectionInfo
import dorkbox.network.serialization.AeronInput import dorkbox.network.serialization.AeronInput
import dorkbox.network.serialization.AeronOutput import dorkbox.network.serialization.AeronOutput
import dorkbox.network.storage.SettingsStore import dorkbox.network.storage.SettingsStore
import dorkbox.util.Sys
import dorkbox.util.entropy.Entropy import dorkbox.util.entropy.Entropy
import dorkbox.util.exceptions.SecurityException import dorkbox.util.exceptions.SecurityException
import mu.KLogger import mu.KLogger
@ -109,13 +109,15 @@ internal class CryptoManagement(val logger: KLogger,
} }
} }
logger.info("ECC public key: ${Sys.bytesToHex(publicKeyBytes)}") publicKeyBytes!!
logger.info("ECC public key: ${publicKeyBytes.toHexString()}")
this.publicKey = keyFactory.generatePublic(XECPublicKeySpec(X25519KeySpec, BigInteger(publicKeyBytes))) as XECPublicKey this.publicKey = keyFactory.generatePublic(XECPublicKeySpec(X25519KeySpec, BigInteger(publicKeyBytes))) as XECPublicKey
this.privateKey = keyFactory.generatePrivate(XECPrivateKeySpec(X25519KeySpec, privateKeyBytes)) as XECPrivateKey this.privateKey = keyFactory.generatePrivate(XECPrivateKeySpec(X25519KeySpec, privateKeyBytes)) as XECPrivateKey
this.privateKeyBytes = privateKeyBytes!! this.privateKeyBytes = privateKeyBytes!!
this.publicKeyBytes = publicKeyBytes!! this.publicKeyBytes = publicKeyBytes
} }
private fun createKeyPair(secureRandom: SecureRandom): Pair<XECPublicKeySpec, XECPrivateKeySpec> { private fun createKeyPair(secureRandom: SecureRandom): Pair<XECPublicKeySpec, XECPrivateKeySpec> {

2
src/dorkbox/network/serialization/KryoExtra.kt
View File

@ -237,7 +237,7 @@ class KryoExtra<CONNECTION: Connection>() : Kryo() {
// val compressedLength = compressor.compress(writer.buffer, 0, length, compressOutput, 0, maxCompressedLength) // val compressedLength = compressor.compress(writer.buffer, 0, length, compressOutput, 0, maxCompressedLength)
// //
// if (DEBUG) { // if (DEBUG) {
// val orig = Sys.bytesToHex(writer.buffer, 0, length) // val orig = Sys.bytesToHex(writer.buffer, 0, length) use String.toHexBytes() instead
// val compressed = Sys.bytesToHex(compressOutput, 0, compressedLength) // val compressed = Sys.bytesToHex(compressOutput, 0, compressedLength)
// logger.error(OS.LINE_SEPARATOR + // logger.error(OS.LINE_SEPARATOR +
// "ORIG: (" + length + ")" + OS.LINE_SEPARATOR + orig + // "ORIG: (" + length + ")" + OS.LINE_SEPARATOR + orig +