Merge pull request #5 from mildred/gcsafe

Implement gcsafe
cteea · Apr 14, 2023 · c699f32 · c699f32
2 parents 29c8d8c + c8b1699
commit c699f32
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/nauthy.nim b/src/nauthy.nim
@@ -132,14 +132,14 @@ proc otpFromUri*(uri: string): Otp =
   accname = accname.strip()
   if otpType == HotpT:
     let counter = params["counter"].parseInt
-    var hotp = initHotp(secret.base32Decode(autoFixPadding=true), false, digits, algorithms[algorithm])
+    var hotp = initHotp(secret.base32Decode(autoFixPadding=true), false, digits, getAlgorithm(algorithm))
     let uri = newUri(issuer, accname)
     hotp.uri = uri
     hotp.initialCounter = counter
     result = Otp(otpType: HotpT, hotp: hotp)
   else:
     let period = if params.hasKey("period"): (TimeInterval)(params["period"].parseInt) else: (TimeInterval)(30)
-    var totp = initTotp(secret.base32Decode(autoFixPadding=true), false, digits, period, algorithms[algorithm])
+    var totp = initTotp(secret.base32Decode(autoFixPadding=true), false, digits, period, getAlgorithm(algorithm))
     let uri = newUri(issuer, accname)
     totp.uri = uri
     result  = Otp(otpType: TotpT, totp: totp)

diff --git a/src/nauthy/hashfuncs.nim b/src/nauthy/hashfuncs.nim
@@ -31,28 +31,33 @@ proc sha1Digest(input: Bytes): Bytes =
   let input = cast[string](input)
   result = @(distinctBase(secureHash(input)))
 
-let sha1Hash*: HashFunc = (hash: sha1Digest, blockSize: 64, name: $SHA1)
+const sha1Hash*: HashFunc = (hash: sha1Digest, blockSize: 64, name: $SHA1)
 
 proc md5Digest(input: Bytes): Bytes =
   ## Generates MD5 hash from the given bytes.
   let input = cast[string](input)
   let digest = getMD5(input)
   result = cast[Bytes](parseHexStr(digest))
 
-let md5Hash*: HashFunc = (hash: md5Digest, blockSize: 64, name: $MD5)
+const md5Hash*: HashFunc = (hash: md5Digest, blockSize: 64, name: $MD5)
 
 proc sha256Digest(input: Bytes): Bytes =
   let input = cast[string](input)
   let digest = computeSHA256(input).toSeq()
   result = cast[Bytes](digest)
 
-let sha256Hash*: HashFunc = (hash: sha256Digest, blockSize: 64, name: $SHA256)
+const sha256Hash*: HashFunc = (hash: sha256Digest, blockSize: 64, name: $SHA256)
 
 proc sha512Digest(input: Bytes): Bytes =
   let input = cast[string](input)
   let digest = computeSHA512(input).toSeq()
   result = cast[Bytes](digest)
 
-let sha512Hash*: HashFunc = (hash: sha512Digest, blockSize: 128, name: $SHA512)
+const sha512Hash*: HashFunc = (hash: sha512Digest, blockSize: 128, name: $SHA512)
 
-let algorithms = {MD5: md5Hash, SHA1: sha1Hash, SHA256: sha256Hash, SHA512: sha512Hash}.toTable
+func getAlgorithm*(name: auto): auto {.gcsafe.} =
+  case name
+  of MD5: result = md5Hash
+  of SHA1: result = sha1Hash
+  of SHA256: result = sha256Hash
+  of SHA512: result = sha512Hash
diff --git a/src/nauthy/utils.nim b/src/nauthy/utils.nim
@@ -8,7 +8,7 @@ const b32Table = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
 type
   Bytes* = seq[byte]
   HashFunc* = tuple
-    hash: proc (input: Bytes): Bytes {.nimcall.}
+    hash: proc (input: Bytes): Bytes {.nimcall, gcsafe.}
     blockSize: int
     name: string