PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-01-19 18:44:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1117 from Resaec/optimisations_MD5MAC

Browse source 
Optimisations on MD5MAC and updated Scala version to 2.13.10
This commit is contained in:
Jakob Gillich 2023-07-10 03:13:10 +02:00 committed by GitHub
parent b0d7ae12d1 c7a697213b
commit 947a931fd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.sbt
View file

@ -3,9 +3,7 @@
lazy val psforeverSettings = Seq(
organization := "net.psforever",
version := "1.0.2-SNAPSHOT",
// TODO 2.13.5+ breaks Md5Mac test
// possibly due to ListBuffer changes? https://github.com/scala/scala/pull/9257
scalaVersion := "2.13.4",
scalaVersion := "2.13.10",
Global / cancelable := false,
semanticdbEnabled := true,
semanticdbVersion := scalafixSemanticdb.revision,

29
src/main/scala/net/psforever/util/Md5Mac.scala
View file

@ -1,7 +1,7 @@
package net.psforever.util
import scodec.bits.ByteVector
import scala.collection.mutable.ListBuffer
import scala.collection.mutable.ArrayBuffer
object Md5Mac {
val BLOCKSIZE = 64
@ -39,12 +39,12 @@ object Md5Mac {
class Md5Mac(val key: ByteVector) {
import Md5Mac._
private val buffer: ListBuffer[Byte] = ListBuffer.fill(BLOCKSIZE)(0)
private val digest: ListBuffer[Byte] = ListBuffer.fill(DIGESTSIZE)(0)
private val m: ListBuffer[Byte] = ListBuffer.fill(32)(0)
private val k1: ListBuffer[Byte] = ListBuffer.fill(16)(0)
private val k2: ListBuffer[Byte] = ListBuffer.fill(16)(0)
private val k3: ListBuffer[Byte] = ListBuffer.fill(BLOCKSIZE)(0)
private val buffer: ArrayBuffer[Byte] = ArrayBuffer.fill(BLOCKSIZE)(0)
private val digest: ArrayBuffer[Byte] = ArrayBuffer.fill(DIGESTSIZE)(0)
private val m: ArrayBuffer[Byte] = ArrayBuffer.fill(32)(0)
private val k1: ArrayBuffer[Byte] = ArrayBuffer.fill(16)(0)
private val k2: ArrayBuffer[Byte] = ArrayBuffer.fill(16)(0)
private val k3: ArrayBuffer[Byte] = ArrayBuffer.fill(BLOCKSIZE)(0)
private var count: Long = 0
private var position: Int = 0
@ -58,8 +58,8 @@ class Md5Mac(val key: ByteVector) {
doKey()
private def doKey(): Unit = {
val ek: ListBuffer[Byte] = ListBuffer.fill(48)(0)
val data: ListBuffer[Byte] = ListBuffer.fill(128)(0)
val ek: ArrayBuffer[Byte] = ArrayBuffer.fill(48)(0)
val data: ArrayBuffer[Byte] = ArrayBuffer.fill(128)(0)
(0 until 16).foreach(j => {
data(j) = key(j % key.length)
data(j + 112) = key(j % key.length)
@ -175,7 +175,14 @@ class Md5Mac(val key: ByteVector) {
}
private def mkInt(lb: Iterable[Byte], pos: Int = 0): Int = {
ByteVector.view(lb.slice(pos, pos + 4).toArray).toInt()
// get iterator
val it = lb.iterator.drop(pos)
(it.next().toInt & 0xFF) << 24 |
(it.next().toInt & 0xFF) << 16 |
(it.next().toInt & 0xFF) << 8 |
(it.next().toInt & 0xFF)
}
private def ff(a: Int, b: Int, c: Int, d: Int, msg: Int, shift: Int, magic: Int): Int = {
@ -226,7 +233,7 @@ class Md5Mac(val key: ByteVector) {
* @return the hash
*/
def doFinal(length: Int = MACLENGTH): ByteVector = {
val output: ListBuffer[Byte] = ListBuffer.fill(MACLENGTH)(0)
val output: ArrayBuffer[Byte] = ArrayBuffer.fill(MACLENGTH)(0)
buffer(position) = 0x80.toByte
(position + 1 until BLOCKSIZE).foreach(i => buffer(i) = 0)
if (position >= BLOCKSIZE - 8) {