Set padding in SRPKey(hex:)

adam-fowler · Oct 31, 2024 · 7d2ca05 · 7d2ca05
1 parent c4341f0
commit 7d2ca05
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Sources/SRP/keys.swift b/Sources/SRP/keys.swift
@@ -26,10 +26,10 @@ public struct SRPKey {
     }
 
     /// Initialize with a hex string
-    @inlinable public init?(hex: String, padding: Int = 0) {
+    @inlinable public init?(hex: String, padding: Int? = nil) {
         guard let number = BigNum(hex: hex) else { return nil }
         self.number = number
-        self.padding = padding
+        self.padding = padding ?? (hex.count + 1) / 2
     }
 
     /// Initialize with a BigNum

diff --git a/Tests/SRPTests/SRPTests.swift b/Tests/SRPTests/SRPTests.swift
@@ -4,6 +4,13 @@ import Crypto
 import XCTest
 
 final class SRPTests: XCTestCase {
+    func testHexKeyConversion() {
+        let hex = "0004f6789b"
+        XCTAssertEqual(hex, SRPKey(hex: hex)?.hex)
+        let hex2 = "4f6789b"
+        XCTAssertEqual("04f6789b", SRPKey(hex: hex2)?.hex)
+    }
+
     func testSRPSharedSecret() {
         let username = "adamfowler"
         let password = "testpassword"