X-Git-Url: https://git.siccegge.de//index.cgi?p=software%2FDIPE.git;a=blobdiff_plain;f=tests%2FtestDIPE.cpp;fp=tests%2FtestDIPE.cpp;h=a436c24c7914be8df0184eb26ea95752031a9a42;hp=0c8e155b00234e78e1c1fb004964e3e506f81483;hb=1456d1c666d403b51244d39bde73e8b4a129695a;hpb=5611c662936ee7c02b5b4d6e7ede3cbde8dfde92

diff --git a/tests/testDIPE.cpp b/tests/testDIPE.cpp
index 0c8e155..a436c24 100644
--- a/tests/testDIPE.cpp
+++ b/tests/testDIPE.cpp
@@ -206,7 +206,7 @@ TEST(DipeTest, DipeDecryptSuccessSmall) {
 		memcpy(ptxt, "test", 4);
 
 		dipe_encrypt(param, 1, &pk, 1, x, 4, ptxt, clen, ctxt);
-		ptxt_len = dipe_decrypt(param, 1, &sk, "1234567890abcdef", y, clen, ctxt, ptxt);
+		ptxt_len = dipe_decrypt(param, 1, &sk, 0, "1234567890abcdef", y, clen, ctxt, ptxt);
 
 		if (clen >= overhead + 4) {
 			EXPECT_EQ(ptxt_len, 4);
@@ -262,7 +262,7 @@ TEST(DipeTest, DipeDecryptSuccessTightSmall) {
 		memcpy(ptxt, "test", 4);
 
 		dipe_encrypt(param, 1, &pk, 1, x, 4, ptxt, clen, ctxt);
-		ptxt_len = dipe_decrypt(param, 1, &sk, "1234567890abcdef", y, clen, ctxt, ptxt);
+		ptxt_len = dipe_decrypt(param, 1, &sk, 0, "1234567890abcdef", y, clen, ctxt, ptxt);
 
 		if (clen >= overhead + 4) {
 			EXPECT_EQ(ptxt_len, 4);
@@ -318,7 +318,7 @@ TEST(DipeTest, DipeDecryptSuccessLargeBlocksize) {
 		memcpy(ptxt, "aaaaaaaaaaaaaaaabbbbbbbbbbbb", 28);
 
 		dipe_encrypt(param, 1, &pk, 1, x, 28, ptxt, clen, ctxt);
-		ptxt_len = dipe_decrypt(param, 1, &sk, "1234567890abcdef", y, clen, ctxt, ptxt);
+		ptxt_len = dipe_decrypt(param, 1, &sk, 0, "1234567890abcdef", y, clen, ctxt, ptxt);
 
 		if (clen >= overhead + 28) {
 			EXPECT_EQ(ptxt_len, 28);
@@ -375,7 +375,7 @@ TEST(DipeTest, DipeDecryptSuccessTightLargeBlocksize) {
 		memcpy(ptxt, "aaaaaaaaaaaaaaaabbbbbbbbbbbb", 28);
 
 		dipe_encrypt(param, 1, &pk, 1, x, 28, ptxt, clen, ctxt);
-		ptxt_len = dipe_decrypt(param, 1, &sk, "1234567890abcdef", y, clen, ctxt, ptxt);
+		ptxt_len = dipe_decrypt(param, 1, &sk, 0, "1234567890abcdef", y, clen, ctxt, ptxt);
 
 		if (clen >= overhead + 28) {
 			EXPECT_EQ(ptxt_len, 28);
@@ -431,7 +431,7 @@ TEST(DipeTest, DipeDecryptSuccessLargeNonBlocksize) {
 		memcpy(ptxt, "aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbccc", 35);
 
 		dipe_encrypt(param, 1, &pk, 1, x, 35, ptxt, clen, ctxt);
-		ptxt_len = dipe_decrypt(param, 1, &sk, "1234567890abcdef", y, clen, ctxt, ptxt);
+		ptxt_len = dipe_decrypt(param, 1, &sk, 0, "1234567890abcdef", y, clen, ctxt, ptxt);
 
 		if (clen >= overhead + 35) {
 			EXPECT_EQ(ptxt_len, 35);
@@ -488,7 +488,7 @@ TEST(DipeTest, DipeDecryptSuccessTightLargeNonBlocksize) {
 		memcpy(ptxt, "aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbccc", 35);
 
 		dipe_encrypt(param, 1, &pk, 1, x, 35, ptxt, clen, ctxt);
-		ptxt_len = dipe_decrypt(param, 1, &sk, "1234567890abcdef", y, clen, ctxt, ptxt);
+		ptxt_len = dipe_decrypt(param, 1, &sk, 0, "1234567890abcdef", y, clen, ctxt, ptxt);
 
 		if (clen >= overhead + 35) {
 			EXPECT_EQ(ptxt_len, 35);
@@ -509,6 +509,130 @@ TEST(DipeTest, DipeDecryptSuccessTightLargeNonBlocksize) {
 	dipe_free_secretkey(sk);
 }
 
+TEST(DipeTest, DipeDecryptSuccessMultiKey) {
+	size_t ptxt_len;
+	size_t overhead;
+	dipe_master_publickey_t pk[3];
+	dipe_master_secretkey_t msk[3];
+	dipe_secretkey_t sk[3];
+
+	element_t y[6];
+	element_t x[6];
+
+	for (size_t i = 0; i < 6; i+=2) {
+		element_init_Zr(y[i], *dipe_get_pairing(param));
+		element_init_Zr(x[i], *dipe_get_pairing(param));
+		element_init_Zr(y[i+1], *dipe_get_pairing(param));
+		element_init_Zr(x[i+1], *dipe_get_pairing(param));
+
+		element_set1(y[i]);
+		element_set1(x[i+1]);
+		element_random(y[i+1]);
+		element_neg(x[i], y[i+1]);
+	}
+
+	for (size_t i = 0; i < 3; ++i) {
+		dipe_master_keygen(param, 6, &pk[i], &msk[i]);
+		dipe_keygen(param, msk[i], "1234567890abcdef", y, &sk[i]);
+	}
+	overhead = dipe_ciphertext_overhead(param, 6, 0);
+
+	char ctxt[overhead + 35];
+	char ptxt[overhead + 35];
+
+
+	for (size_t clen = overhead; clen <= overhead + 35; ++clen) {
+		memset(ctxt, 0, overhead + 35);
+		memset(ptxt, 0, overhead + 35);
+		memcpy(ptxt, "aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbccc", 35);
+
+		dipe_encrypt(param, 3, pk, 3, x, 35, ptxt, clen, ctxt);
+		ptxt_len = dipe_decrypt(param, 3, sk, 0, "1234567890abcdef", y, clen, ctxt, ptxt);
+
+		if (clen >= overhead + 35) {
+			EXPECT_EQ(ptxt_len, 35);
+			EXPECT_STREQ(ptxt, "aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbccc");
+		}
+		else {
+			EXPECT_EQ(ptxt_len, 0);
+		}
+	}
+
+	for (size_t i = 0; i < 6; ++i) {
+		element_clear(y[i]);
+		element_clear(x[i]);
+	}
+
+	for (size_t i = 0; i < 3; ++i) {
+		dipe_free_master_secretkey(msk[i]);
+		dipe_free_master_publickey(pk[i]);
+		dipe_free_secretkey(sk[i]);
+	}
+}
+
+TEST(DipeTest, DipeDecryptSuccessThreshold) {
+	size_t ptxt_len;
+	size_t overhead;
+	dipe_master_publickey_t pk[3];
+	dipe_master_secretkey_t msk[3];
+	dipe_secretkey_t sk[3];
+
+	element_t y[6];
+	element_t x[6];
+
+	for (size_t i = 0; i < 6; i+=2) {
+		element_init_Zr(y[i], *dipe_get_pairing(param));
+		element_init_Zr(x[i], *dipe_get_pairing(param));
+		element_init_Zr(y[i+1], *dipe_get_pairing(param));
+		element_init_Zr(x[i+1], *dipe_get_pairing(param));
+
+		element_set1(y[i]);
+		element_set1(x[i+1]);
+		element_random(y[i+1]);
+		element_neg(x[i], y[i+1]);
+	}
+
+	for (size_t i = 0; i < 3; ++i) {
+		dipe_master_keygen(param, 6, &pk[i], &msk[i]);
+		dipe_keygen(param, msk[i], "1234567890abcdef", y, &sk[i]);
+	}
+	overhead = dipe_ciphertext_overhead(param, 6, 2);
+
+	char ctxt[overhead + 35];
+	char ptxt[overhead + 35];
+
+
+	for (size_t clen = overhead+20; clen <= overhead + 35; ++clen) {
+		for (size_t kid = 0; kid < 3; ++kid) {
+			memset(ctxt, 0, overhead + 35);
+			memset(ptxt, 0, overhead + 35);
+			memcpy(ptxt, "aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbccc", 35);
+
+			dipe_encrypt(param, 3, pk, 1, x, 35, ptxt, clen, ctxt);
+			ptxt_len = dipe_decrypt(param, 1, &sk[kid], 2, "1234567890abcdef", y, clen, ctxt, ptxt);
+
+			if (clen >= overhead + 35) {
+				EXPECT_EQ(ptxt_len, 35);
+				EXPECT_STREQ(ptxt, "aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbccc");
+			}
+			else {
+				EXPECT_EQ(ptxt_len, 0);
+			}
+		}
+	}
+
+	for (size_t i = 0; i < 6; ++i) {
+		element_clear(y[i]);
+		element_clear(x[i]);
+	}
+
+	for (size_t i = 0; i < 3; ++i) {
+		dipe_free_master_secretkey(msk[i]);
+		dipe_free_master_publickey(pk[i]);
+		dipe_free_secretkey(sk[i]);
+	}
+}
+