Merge pull request #76 from cryptimeleon/feature/fix-pseudo-randomness

Extract randomness and remove bug with same randomless for different promotions
cryptimeleon · Feb 16, 2022 · bba3365 · bba3365
2 parents 4d7b047 + 002cbcd
commit bba3365
Show file tree

Hide file tree

Showing 8 changed files with 123 additions and 71 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Next Release
 
+- Extract client-side pseudorandomness and include promotionId to PRF input [#76](https://github.com/cryptimeleon/incentive-system/pull/76)
 - Add streak and VIP promotion, polishing of the promotion api [71](https://github.com/cryptimeleon/incentive-system/pull/71)
 - Integrate promotions to app, ui updates, and project refactoring [#70](https://github.com/cryptimeleon/incentive-system/pull/70)
 - Add v1 of service that integrates promotion and the crypto protocols [#65](https://github.com/cryptimeleon/incentive-system/pull/65)

diff --git a/android/app/src/main/java/org/cryptimeleon/incentive/app/data/CryptoRepository.kt b/android/app/src/main/java/org/cryptimeleon/incentive/app/data/CryptoRepository.kt
@@ -62,7 +62,7 @@ class CryptoRepository(
         val userKeyPair = cryptoMaterial.ukp
         val incentiveSystem = IncentiveSystem(pp)
 
-        val joinRequest = incentiveSystem.generateJoinRequest(providerPublicKey, userKeyPair)
+        val joinRequest = incentiveSystem.generateJoinRequest(providerPublicKey, userKeyPair, promotionParameters)
         val joinResponse = cryptoApiService.runIssueJoin(
             jsonConverter.serialize(joinRequest.representation),
             promotionParameters.promotionId.toString(),

diff --git a/android/app/src/sharedTest/java/org/cryptimeleon/incentive/app/data/FakeCryptoRepository.kt b/android/app/src/sharedTest/java/org/cryptimeleon/incentive/app/data/FakeCryptoRepository.kt
@@ -32,7 +32,7 @@ class FakeCryptoRepository(
     override suspend fun runIssueJoin(promotionParameters: PromotionParameters, dummy: Boolean) {
         if (!dummy) {
             val incentiveSystem = IncentiveSystem(pp)
-            val joinRequest = incentiveSystem.generateJoinRequest(providerKeyPair.pk, userKeyPair)
+            val joinRequest = incentiveSystem.generateJoinRequest(providerKeyPair.pk, userKeyPair, promotionParameters)
             val joinResponse = incentiveSystem.generateJoinRequestResponse(
                 promotionParameters,
                 providerKeyPair,
@@ -59,4 +59,4 @@ class FakeCryptoRepository(
     ) {
         TODO("Not yet implemented")
     }
-}
+}
diff --git a/crypto/src/main/java/org/cryptimeleon/incentive/crypto/IncentiveSystem.java b/crypto/src/main/java/org/cryptimeleon/incentive/crypto/IncentiveSystem.java
diff --git a/crypto/src/main/java/org/cryptimeleon/incentive/crypto/benchmark/Benchmark.java b/crypto/src/main/java/org/cryptimeleon/incentive/crypto/benchmark/Benchmark.java
@@ -96,7 +96,8 @@ public static BenchmarkResult runBenchmark(
             start = Instant.now();
             joinRequest = incentiveSystem.generateJoinRequest(
                     ppk,
-                    userKeyPair
+                    userKeyPair,
+                    promotionParameters
             );
             finish = Instant.now();
             tJoinRequest[i] = Duration.between(start, finish).toNanos();

diff --git a/crypto/src/test/java/org/cryptimeleon/incentive/crypto/IncentiveSystemTest.java b/crypto/src/test/java/org/cryptimeleon/incentive/crypto/IncentiveSystemTest.java
@@ -66,7 +66,8 @@ public void fullProtocolTestRun() {
         // user generates join request
         var joinRequest = incSys.generateJoinRequest(
                 pkp.getPk(),
-                ukp
+                ukp,
+                promotionParameters
         );
 
         // serialize and deserialize join request to ensure serialization does not break anything

diff --git a/...ent/src/test/java/org/cryptimeleon/incentive/client/integrationtest/FullWorkflowTest.java b/...ent/src/test/java/org/cryptimeleon/incentive/client/integrationtest/FullWorkflowTest.java
@@ -53,7 +53,7 @@ void runFullWorkflow() {
         var userKeyPair = incentiveSystem.generateUserKeys();
 
         log.info("Send join request to server and retrieve token");
-        var joinRequest = incentiveSystem.generateJoinRequest(providerPublicKey, userKeyPair);
+        var joinRequest = incentiveSystem.generateJoinRequest(providerPublicKey, userKeyPair, testPromotion.getPromotionParameters());
         var serializedJoinResponse = incentiveClient.sendJoinRequest(
                 jsonConverter.serialize(joinRequest.getRepresentation()),
                 jsonConverter.serialize(userKeyPair.getPk().getRepresentation()),

diff --git a/...inc/src/test/java/org/cryptimeleon/incentive/services/promotion/PromotionServiceTest.java b/...inc/src/test/java/org/cryptimeleon/incentive/services/promotion/PromotionServiceTest.java
@@ -126,7 +126,7 @@ public void promotionServiceTest(@Autowired WebTestClient webClient) {
         Promotion promotionToJoin = promotions.get(0);
 
         // Create request to send
-        var joinRequest = incentiveSystem.generateJoinRequest(pkp.getPk(), ukp);
+        var joinRequest = incentiveSystem.generateJoinRequest(pkp.getPk(), ukp, promotionToJoin.getPromotionParameters());
 
         // Send request and process response to assert correct behavior
         var serializedJoinResponse = webClient.post()