PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-07-16 08:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge e724a04d1a into 6f4ceaee29

Browse source
This commit is contained in:
Wtz_LASR 2023-05-31 21:25:00 +08:00 • committed by GitHub
commit 7109397eb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 15 deletions
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( lazy val psforeverSettings = Seq(
organization := "net.psforever", organization := "net.psforever",
version := "1.0.2-SNAPSHOT", version := "1.0.2-SNAPSHOT",
// TODO 2.13.5+ breaks Md5Mac test scalaVersion := "2.13.10",
// possibly due to ListBuffer changes? https://github.com/scala/scala/pull/9257
scalaVersion := "2.13.4",
Global / cancelable := false, Global / cancelable := false,
semanticdbEnabled := true, semanticdbEnabled := true,
semanticdbVersion := scalafixSemanticdb.revision, semanticdbVersion := scalafixSemanticdb.revision,

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

@ -1,7 +1,7 @@
package net.psforever.util package net.psforever.util
import scodec.bits.ByteVector import scodec.bits.ByteVector
import scala.collection.mutable.ListBuffer import scala.collection.mutable.ArrayBuffer
object Md5Mac { object Md5Mac {
val BLOCKSIZE = 64 val BLOCKSIZE = 64
@ -39,14 +39,14 @@ object Md5Mac {
class Md5Mac(val key: ByteVector) { class Md5Mac(val key: ByteVector) {
import Md5Mac._ import Md5Mac._
private val buffer: ListBuffer[Byte] = ListBuffer.fill(BLOCKSIZE)(0) private val buffer: ArrayBuffer[Byte] = ArrayBuffer.fill(BLOCKSIZE)(0)
private val digest: ListBuffer[Byte] = ListBuffer.fill(DIGESTSIZE)(0) private val digest: ArrayBuffer[Byte] = ArrayBuffer.fill(DIGESTSIZE)(0)
private val m: ListBuffer[Byte] = ListBuffer.fill(32)(0) private val m: ArrayBuffer[Byte] = ArrayBuffer.fill(32)(0)
private val k1: ListBuffer[Byte] = ListBuffer.fill(16)(0) private val k1: ArrayBuffer[Byte] = ArrayBuffer.fill(16)(0)
private val k2: ListBuffer[Byte] = ListBuffer.fill(16)(0) private val k2: ArrayBuffer[Byte] = ArrayBuffer.fill(16)(0)
private val k3: ListBuffer[Byte] = ListBuffer.fill(BLOCKSIZE)(0) private val k3: ArrayBuffer[Byte] = ArrayBuffer.fill(BLOCKSIZE)(0)
private var count: Long = 0 private var count: Long = 0
private var position: Int = 0 private var position: Int = 0
private val t: Seq[Seq[Byte]] = Seq( private val t: Seq[Seq[Byte]] = Seq(
Seq(0x97, 0xef, 0x45, 0xac, 0x29, 0x0f, 0x43, 0xcd, 0x45, 0x7e, 0x1b, 0x55, 0x1c, 0x80, 0x11, 0x34), Seq(0x97, 0xef, 0x45, 0xac, 0x29, 0x0f, 0x43, 0xcd, 0x45, 0x7e, 0x1b, 0x55, 0x1c, 0x80, 0x11, 0x34),
@ -58,8 +58,8 @@ class Md5Mac(val key: ByteVector) {
doKey() doKey()
private def doKey(): Unit = { private def doKey(): Unit = {
val ek: ListBuffer[Byte] = ListBuffer.fill(48)(0) val ek: ArrayBuffer[Byte] = ArrayBuffer.fill(48)(0)
val data: ListBuffer[Byte] = ListBuffer.fill(128)(0) val data: ArrayBuffer[Byte] = ArrayBuffer.fill(128)(0)
(0 until 16).foreach(j => { (0 until 16).foreach(j => {
data(j) = key(j % key.length) data(j) = key(j % key.length)
data(j + 112) = key(j % key.length) data(j + 112) = key(j % key.length)
@ -226,7 +226,7 @@ class Md5Mac(val key: ByteVector) {
* @return the hash * @return the hash
*/ */
def doFinal(length: Int = MACLENGTH): ByteVector = { 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 buffer(position) = 0x80.toByte
(position + 1 until BLOCKSIZE).foreach(i => buffer(i) = 0) (position + 1 until BLOCKSIZE).foreach(i => buffer(i) = 0)
if (position >= BLOCKSIZE - 8) { if (position >= BLOCKSIZE - 8) {