codex-storage/constantine
1
0
Fork 0
mirror of https://github.com/codex-storage/constantine.git synced 2025-01-14 04:54:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Typo when testing for "negative" bigint, now passing testing vs GMP

Browse Source
This commit is contained in:
Mamy André-Ratsimbazafy 2020-02-10 23:56:57 +01:00
parent b53f203e30
commit 24b0477ad7
No known key found for this signature in database
GPG Key ID: 7B88AD1FE79492E1
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constantine/bigints_raw.nim
View File

@ -379,7 +379,7 @@ func shlAddMod(a: BigIntViewMut, c: Word, M: BigIntViewConst) =
# if carry < q or carry == q and over_p we must do "a -= p" # if carry < q or carry == q and over_p we must do "a -= p"
# if carry > hi (negative result) we must do "a += p" # if carry > hi (negative result) we must do "a += p"
let neg = carry < hi let neg = carry > hi
let tooBig = not neg and (over_p or (carry < hi)) let tooBig = not neg and (over_p or (carry < hi))
discard a.add(M, ctl = neg) discard a.add(M, ctl = neg)

27
tests/test_bigints_vs_gmp.nim
View File

@ -23,6 +23,8 @@ const CryptoModSizes = [
# RSA # RSA
1024, 1024,
2048,
3072,
# secp256k1, Curve25519 # secp256k1, Curve25519
256, 256,
# Barreto-Naehrig # Barreto-Naehrig
@ -47,7 +49,7 @@ macro testRandomModSizes(numSizes: static int, aBits, mBits, body: untyped): unt
result = newStmtList() result = newStmtList()
for _ in 0 ..< numSizes: for _ in 0 ..< numSizes:
let aBitsVal = bitSizeRNG.rand(126 .. 4096) let aBitsVal = bitSizeRNG.rand(126 .. 8192)
let mBitsVal = block: let mBitsVal = block:
# Pick from curve modulus if odd # Pick from curve modulus if odd
if bool(bitSizeRNG.rand(high(int)) and 1): if bool(bitSizeRNG.rand(high(int)) and 1):
@ -87,9 +89,9 @@ proc main() =
mpz_init(m) mpz_init(m)
mpz_init(r) mpz_init(r)
testRandomModSizes(100, aBits, mBits): testRandomModSizes(128, aBits, mBits):
echo "--------------------------------------------------------------------------------" # echo "--------------------------------------------------------------------------------"
stdout.write "Testing: Dividend bitsize " & align($aBits, 4) & " -- modulus bitsize " & align($mBits, 4) echo "Testing: random dividend (" & align($aBits, 4) & "-bit) -- random modulus (" & align($mBits, 4) & "-bit)"
# Generate random value in the range 0 ..< 2^aBits # Generate random value in the range 0 ..< 2^aBits
mpz_urandomb(a, gmpRng, aBits) mpz_urandomb(a, gmpRng, aBits)
@ -97,7 +99,7 @@ proc main() =
mpz_urandomb(m, gmpRng, mBits) mpz_urandomb(m, gmpRng, mBits)
mpz_setbit(m, mBits-1) mpz_setbit(m, mBits-1)
discard gmp_printf(" -- %#Zx mod %#Zx\n", a.addr, m.addr) # discard gmp_printf(" -- %#Zx mod %#Zx\n", a.addr, m.addr)
######################################################### #########################################################
# Conversion buffers # Conversion buffers
@ -136,9 +138,18 @@ proc main() =
var rConstantine: array[mLen, byte] var rConstantine: array[mLen, byte]
dumpRawUint(rConstantine, rTest, littleEndian) dumpRawUint(rConstantine, rTest, littleEndian)
echo "rGMP: ", rGMP.toHex() # echo "rGMP: ", rGMP.toHex()
echo "rConstantine: ", rConstantine.toHex() # echo "rConstantine: ", rConstantine.toHex()
doAssert rGMP == rConstantine doAssert rGMP == rConstantine, block:
# Reexport as bigEndian for debugging
discard mpz_export(aBuf[0].addr, aW.addr, GMP_MostSignificantWordFirst, 1, GMP_WordNativeEndian, 0, a)
discard mpz_export(mBuf[0].addr, mW.addr, GMP_MostSignificantWordFirst, 1, GMP_WordNativeEndian, 0, m)
"\nModulus with operand\n" &
" a (" & align($aBits, 4) & "-bit): " & aBuf.toHex & "\n" &
" m (" & align($mBits, 4) & "-bit): " & mBuf.toHex & "\n" &
"failed:" & "\n" &
" GMP: " & rGMP.toHex() & "\n" &
" Constantine: " & rConstantine.toHex()
main() main()