From 56f8945b46a7000b8e614870955ffaac3c860d00 Mon Sep 17 00:00:00 2001
From: ccyj <2384899431@qq.com>
Date: Mon, 16 Oct 2023 14:51:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20mergeccfrag=20=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0N:int=EF=BC=8Ct:int=20?=
 =?UTF-8?q?=EF=BC=9B=20DecapsulateFrags=E5=87=BD=E6=95=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98=E9=87=8F=E5=90=8D=E5=AD=97,=CE=BB->b?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/tpre.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/tpre.py b/src/tpre.py
index 809f8d6..aca6a7c 100644
--- a/src/tpre.py
+++ b/src/tpre.py
@@ -370,7 +370,8 @@ def ReEncrypt(kFrag:list,
 # capsule, enc_Data = C
 
 
-def mergecfrag()->tuple[Tuple[Tuple[int,int],Tuple[int,int]
+# N 是加密节点的数量，t是阈值
+def mergecfrag(N:int,t:int)->tuple[Tuple[Tuple[int,int],Tuple[int,int]
                               ,int,Tuple[int,int]], ...]:
     cfrags = ()
     kfrags = GenerateReKey(sk_A,pk_B,N,t)
@@ -423,8 +424,8 @@ def DecapsulateFrags(sk_B:int,pk_A:Tuple[int,int],cFrags:Tuple[Tuple[Tuple[int,i
     E2=multiply(Elist[0],bis[0])             #  E^  便于计算
     V2=multiply(Vlist[0],bis[0])             #  V^
     for k in range(1,t):
-        Ek = multiply(Elist[k],λis[k])     # EK/Vk 是个列表/元组
-        Vk = multiply(Vlist[k],λis[k])
+        Ek = multiply(Elist[k],bis[k])     # EK/Vk 是个列表
+        Vk = multiply(Vlist[k],bis[k])
         E2 = add(Ek,E2)   
         V2 = add(Vk,V2)
     Xab = multiply(Xa,b)     # Xa^b