fix: extract hash and kdf from setup

This commit is contained in:
sangge 2023-10-16 22:30:15 +08:00
parent 96e04c155e
commit cd1e884713

View File

@ -118,8 +118,7 @@ def jacobianMultiply(
raise ValueError("jacobian Multiply error") raise ValueError("jacobian Multiply error")
def Setup(sec: int) -> Tuple[CurveFp, Tuple[int, int], def Setup(sec: int) -> Tuple[CurveFp, Tuple[int, int],
Tuple[int, int], Callable, Tuple[int, int]]:
Callable, Callable, Callable]:
''' '''
params: params:
sec: an init safety param sec: an init safety param
@ -128,10 +127,6 @@ def Setup(sec: int) -> Tuple[CurveFp, Tuple[int, int],
G: sm2 curve G: sm2 curve
g: generator g: generator
U: another generator U: another generator
use sm3 as hash function
hash2: G^2 -> Zq
hash3: G^3 -> Zq
hash4: G^3 * Zq -> Zq
''' '''
G = sm2p256v1 G = sm2p256v1
@ -141,50 +136,49 @@ def Setup(sec: int) -> Tuple[CurveFp, Tuple[int, int],
tmp_u = random.randint(0, sm2p256v1.P) tmp_u = random.randint(0, sm2p256v1.P)
U = multiply(g, tmp_u) U = multiply(g, tmp_u)
def hash2(double_G: Tuple[Tuple[int, int], Tuple[int, int]]) -> int: return G, g, U
sm3 = Sm3() #pylint: disable=e0602
for i in double_G:
for j in i:
sm3.update(j.to_bytes(32))
digest = sm3.digest()
digest = int.from_bytes(digest,'big') % sm2p256v1.P
return digest
def hash3(triple_G: Tuple[Tuple[int, int], def hash2(double_G: Tuple[Tuple[int, int], Tuple[int, int]]) -> int:
Tuple[int, int], sm3 = Sm3() #pylint: disable=e0602
Tuple[int, int]]) -> int: for i in double_G:
sm3 = Sm3() #pylint: disable=e0602 for j in i:
for i in triple_G: sm3.update(j.to_bytes(32))
for j in i: digest = sm3.digest()
sm3.update(j.to_bytes(32)) digest = int.from_bytes(digest,'big') % sm2p256v1.P
digest = sm3.digest() return digest
digest = int.from_bytes(digest, 'big') % sm2p256v1.P
return digest
def hash4(triple_G: Tuple[Tuple[int, int], def hash3(triple_G: Tuple[Tuple[int, int],
Tuple[int, int], Tuple[int, int],
Tuple[int, int]], Tuple[int, int]]) -> int:
Zp: int) -> int: sm3 = Sm3() #pylint: disable=e0602
sm3 = Sm3() #pylint: disable=e0602 for i in triple_G:
for i in triple_G: for j in i:
for j in i: sm3.update(j.to_bytes(32))
sm3.update(j.to_bytes(32)) digest = sm3.digest()
sm3.update(Zp.to_bytes(32)) digest = int.from_bytes(digest, 'big') % sm2p256v1.P
digest = sm3.digest() return digest
digest = int.from_bytes(digest, 'big') % sm2p256v1.P
return digest
def KDF(G: Tuple[int, int]) -> int: def hash4(triple_G: Tuple[Tuple[int, int],
sm3 = Sm3() #pylint: disable=e0602 Tuple[int, int],
for i in G: Tuple[int, int]],
sm3.update(i.to_bytes(32)) Zp: int) -> int:
digest = sm3.digest(32) sm3 = Sm3() #pylint: disable=e0602
digest = digest for i in triple_G:
digest = int.from_bytes(digest, 'big') % sm2p256v1.P for j in i:
return digest sm3.update(j.to_bytes(32))
sm3.update(Zp.to_bytes(32))
digest = sm3.digest()
digest = int.from_bytes(digest, 'big') % sm2p256v1.P
return digest
def KDF(G: Tuple[int, int]) -> int:
return G, g, U, hash2, hash3, hash4, KDF sm3 = Sm3() #pylint: disable=e0602
for i in G:
sm3.update(i.to_bytes(32))
digest = sm3.digest(32)
digest = digest
digest = int.from_bytes(digest, 'big') % sm2p256v1.P
return digest
def GenerateKeyPair( def GenerateKeyPair(
lamda_parma: int, lamda_parma: int,
@ -281,7 +275,7 @@ pk_B, sk_B = GenerateKeyPair(0, ())
sec = 256 sec = 256
# 调用Setup函数 # 调用Setup函数
G, g, U, hash2, hash3, hash4, KDF = Setup(sec) G, g, U= Setup(sec)
def GenerateReKey(sk_A, pk_B, N: int, T: int) -> list: def GenerateReKey(sk_A, pk_B, N: int, T: int) -> list:
''' '''