fix for math v3.0.0

cryptimeleon · Sep 22, 2021 · 376e9f4 · 376e9f4
1 parent 6b27b8d
commit 376e9f4
Show file tree

Hide file tree

Showing 78 changed files with 148 additions and 148 deletions.
diff --git a/src/main/java/org/cryptimeleon/predenc/abe/PredicateEncryptionScheme.java b/src/main/java/org/cryptimeleon/predenc/abe/PredicateEncryptionScheme.java
@@ -7,9 +7,9 @@
 import org.cryptimeleon.craco.enc.DecryptionKey;
 import org.cryptimeleon.craco.enc.EncryptionKey;
 import org.cryptimeleon.craco.enc.EncryptionScheme;
+import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.predenc.MasterSecret;
 import org.cryptimeleon.predenc.Predicate;
-import org.cryptimeleon.math.serialization.Representation;
 
 /**
  * A {@code PredicateEncryptionScheme} is an advanced form of {@code EncryptionScheme}

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/large/ABECPWat11.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/large/ABECPWat11.java
@@ -6,8 +6,8 @@
 import org.cryptimeleon.craco.enc.DecryptionKey;
 import org.cryptimeleon.craco.enc.EncryptionKey;
 import org.cryptimeleon.craco.secretsharing.accessstructure.MonotoneSpanProgram;
-import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.serialization.Representation;
+import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.structures.rings.zn.Zp.ZpElement;
 import org.cryptimeleon.predenc.abe.PredicateEncryptionScheme;
 

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/large/ABECPWat11CipherText.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/large/ABECPWat11CipherText.java
@@ -2,11 +2,11 @@
 
 import org.cryptimeleon.craco.common.policies.Policy;
 import org.cryptimeleon.craco.enc.CipherText;
-import org.cryptimeleon.predenc.kem.abe.cp.large.ABECPWat11KEMCipherText;
-import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.math.serialization.annotations.ReprUtil;
 import org.cryptimeleon.math.serialization.annotations.Represented;
+import org.cryptimeleon.math.structures.groups.GroupElement;
+import org.cryptimeleon.predenc.kem.abe.cp.large.ABECPWat11KEMCipherText;
 
 import java.math.BigInteger;
 import java.util.Map;

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/large/ABECPWat11DecryptionKey.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/large/ABECPWat11DecryptionKey.java
@@ -4,10 +4,10 @@
 import org.cryptimeleon.craco.common.attributes.SetOfAttributes;
 import org.cryptimeleon.craco.common.predicate.KeyIndex;
 import org.cryptimeleon.craco.enc.DecryptionKey;
-import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.math.serialization.annotations.ReprUtil;
 import org.cryptimeleon.math.serialization.annotations.Represented;
+import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.predenc.MasterSecret;
 
 import java.util.Map;

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/large/ABECPWat11EncryptionKey.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/large/ABECPWat11EncryptionKey.java
@@ -3,9 +3,9 @@
 import org.cryptimeleon.craco.common.policies.Policy;
 import org.cryptimeleon.craco.common.predicate.CiphertextIndex;
 import org.cryptimeleon.craco.enc.EncryptionKey;
+import org.cryptimeleon.math.hash.ByteAccumulator;
 import org.cryptimeleon.math.hash.annotations.AnnotatedUbrUtil;
 import org.cryptimeleon.math.hash.annotations.UniqueByteRepresented;
-import org.cryptimeleon.math.hash.ByteAccumulator;
 import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.math.serialization.annotations.ReprUtil;
 import org.cryptimeleon.math.serialization.annotations.Represented;

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/large/ABECPWat11MasterSecret.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/large/ABECPWat11MasterSecret.java
@@ -1,10 +1,10 @@
 package org.cryptimeleon.predenc.abe.cp.large;
 
-import org.cryptimeleon.math.structures.groups.Group;
-import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.math.serialization.annotations.ReprUtil;
 import org.cryptimeleon.math.serialization.annotations.Represented;
+import org.cryptimeleon.math.structures.groups.Group;
+import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.predenc.MasterSecret;
 
 import java.util.Objects;

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/large/ABECPWat11PublicParameters.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/large/ABECPWat11PublicParameters.java
@@ -1,14 +1,14 @@
 package org.cryptimeleon.predenc.abe.cp.large;
 
 import org.cryptimeleon.craco.common.PublicParameters;
+import org.cryptimeleon.math.serialization.Representation;
+import org.cryptimeleon.math.serialization.annotations.ReprUtil;
+import org.cryptimeleon.math.serialization.annotations.Represented;
 import org.cryptimeleon.math.structures.groups.Group;
 import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.structures.groups.HashIntoGroup;
 import org.cryptimeleon.math.structures.groups.elliptic.BilinearGroup;
 import org.cryptimeleon.math.structures.groups.elliptic.BilinearMap;
-import org.cryptimeleon.math.serialization.Representation;
-import org.cryptimeleon.math.serialization.annotations.ReprUtil;
-import org.cryptimeleon.math.serialization.annotations.Represented;
 
 import java.util.Objects;
 

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/large/ABECPWat11Setup.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/large/ABECPWat11Setup.java
@@ -1,5 +1,6 @@
 package org.cryptimeleon.predenc.abe.cp.large;
 
+import org.cryptimeleon.math.random.RandomGenerator;
 import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.structures.groups.debug.DebugBilinearGroup;
 import org.cryptimeleon.math.structures.groups.elliptic.BilinearGroup;
@@ -41,7 +42,7 @@ public void doKeyGen(int securityParameter, int n, int l_max, boolean watersHash
         // Generate bilinear group
         BilinearGroup group;
         if (debug) {
-            group = new DebugBilinearGroup(securityParameter, BilinearGroup.Type.TYPE_1);
+            group = new DebugBilinearGroup(RandomGenerator.getRandomPrime(securityParameter), BilinearGroup.Type.TYPE_1);
         } else {
             group = new SupersingularBilinearGroup(securityParameter);
         }

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/large/AbstractABECPWat11.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/large/AbstractABECPWat11.java
@@ -8,17 +8,16 @@
 import org.cryptimeleon.craco.common.predicate.KeyIndex;
 import org.cryptimeleon.craco.enc.DecryptionKey;
 import org.cryptimeleon.craco.enc.EncryptionKey;
-
 import org.cryptimeleon.craco.secretsharing.accessstructure.MonotoneSpanProgram;
-import org.cryptimeleon.predenc.MasterSecret;
-import org.cryptimeleon.predenc.Predicate;
-import org.cryptimeleon.predenc.kem.abe.cp.large.ABECPWat11KEM;
-import org.cryptimeleon.predenc.kem.abe.cp.large.ABECPWat11KEMCipherText;
-import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.math.serialization.annotations.ReprUtil;
 import org.cryptimeleon.math.serialization.annotations.Represented;
+import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.structures.rings.zn.Zp;
+import org.cryptimeleon.predenc.MasterSecret;
+import org.cryptimeleon.predenc.Predicate;
+import org.cryptimeleon.predenc.kem.abe.cp.large.ABECPWat11KEM;
+import org.cryptimeleon.predenc.kem.abe.cp.large.ABECPWat11KEMCipherText;
 
 import java.math.BigInteger;
 import java.util.*;

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/large/distributed/DistributedABECPWat11.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/large/distributed/DistributedABECPWat11.java
@@ -4,17 +4,17 @@
 import org.cryptimeleon.craco.common.attributes.SetOfAttributes;
 import org.cryptimeleon.craco.common.predicate.KeyIndex;
 import org.cryptimeleon.craco.enc.DecryptionKey;
+import org.cryptimeleon.math.serialization.Representation;
+import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.structures.rings.polynomial.LagrangeUtils;
+import org.cryptimeleon.math.structures.rings.zn.Zp;
+import org.cryptimeleon.math.structures.rings.zn.Zp.ZpElement;
 import org.cryptimeleon.predenc.MasterSecret;
 import org.cryptimeleon.predenc.abe.cp.large.ABECPWat11;
 import org.cryptimeleon.predenc.abe.cp.large.ABECPWat11DecryptionKey;
 import org.cryptimeleon.predenc.abe.distributed.DistributedEncryptionScheme;
 import org.cryptimeleon.predenc.abe.distributed.KeyShare;
 import org.cryptimeleon.predenc.abe.distributed.MasterKeyShare;
-import org.cryptimeleon.math.structures.groups.GroupElement;
-import org.cryptimeleon.math.serialization.Representation;
-import org.cryptimeleon.math.structures.rings.zn.Zp;
-import org.cryptimeleon.math.structures.rings.zn.Zp.ZpElement;
 
 import java.math.BigInteger;
 import java.util.*;

diff --git a/...java/org/cryptimeleon/predenc/abe/cp/large/distributed/DistributedABECPWat11KeyShare.java b/...java/org/cryptimeleon/predenc/abe/cp/large/distributed/DistributedABECPWat11KeyShare.java
@@ -2,11 +2,11 @@
 
 import org.cryptimeleon.craco.common.attributes.Attribute;
 import org.cryptimeleon.craco.common.attributes.SetOfAttributes;
-import org.cryptimeleon.predenc.abe.distributed.KeyShare;
-import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.math.serialization.annotations.ReprUtil;
 import org.cryptimeleon.math.serialization.annotations.Represented;
+import org.cryptimeleon.math.structures.groups.GroupElement;
+import org.cryptimeleon.predenc.abe.distributed.KeyShare;
 
 import java.util.Map;
 import java.util.Objects;

diff --git a/...rg/cryptimeleon/predenc/abe/cp/large/distributed/DistributedABECPWat11MasterKeyShare.java b/...rg/cryptimeleon/predenc/abe/cp/large/distributed/DistributedABECPWat11MasterKeyShare.java
@@ -1,10 +1,10 @@
 package org.cryptimeleon.predenc.abe.cp.large.distributed;
 
-import org.cryptimeleon.predenc.abe.distributed.MasterKeyShare;
 import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.math.serialization.StandaloneRepresentable;
 import org.cryptimeleon.math.serialization.annotations.ReprUtil;
 import org.cryptimeleon.math.serialization.annotations.Represented;
+import org.cryptimeleon.predenc.abe.distributed.MasterKeyShare;
 
 import java.math.BigInteger;
 import java.util.Objects;

diff --git a/.../cryptimeleon/predenc/abe/cp/large/distributed/DistributedABECPWat11PublicParameters.java b/.../cryptimeleon/predenc/abe/cp/large/distributed/DistributedABECPWat11PublicParameters.java
@@ -1,11 +1,11 @@
 package org.cryptimeleon.predenc.abe.cp.large.distributed;
 
 import org.cryptimeleon.craco.common.PublicParameters;
-import org.cryptimeleon.predenc.abe.cp.large.ABECPWat11PublicParameters;
-import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.math.serialization.annotations.ReprUtil;
 import org.cryptimeleon.math.serialization.annotations.Represented;
+import org.cryptimeleon.math.structures.groups.GroupElement;
+import org.cryptimeleon.predenc.abe.cp.large.ABECPWat11PublicParameters;
 
 import java.math.BigInteger;
 import java.util.Map;

diff --git a/...in/java/org/cryptimeleon/predenc/abe/cp/large/distributed/DistributedABECPWat11Setup.java b/...in/java/org/cryptimeleon/predenc/abe/cp/large/distributed/DistributedABECPWat11Setup.java
@@ -1,6 +1,6 @@
 package org.cryptimeleon.predenc.abe.cp.large.distributed;
 
-import org.cryptimeleon.predenc.abe.cp.large.ABECPWat11MasterSecret;
+import org.cryptimeleon.math.random.RandomGenerator;
 import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.structures.groups.debug.DebugBilinearGroup;
 import org.cryptimeleon.math.structures.groups.elliptic.BilinearGroup;
@@ -9,6 +9,7 @@
 import org.cryptimeleon.math.structures.rings.polynomial.PolynomialRing;
 import org.cryptimeleon.math.structures.rings.zn.Zp;
 import org.cryptimeleon.math.structures.rings.zn.Zp.ZpElement;
+import org.cryptimeleon.predenc.abe.cp.large.ABECPWat11MasterSecret;
 
 import java.math.BigInteger;
 import java.util.HashMap;
@@ -41,7 +42,7 @@ public void doKeyGen(int securityParameter, int n, int l_max, int t, int L, bool
         // Generate bilinear group
         BilinearGroup group;
         if (debug) {
-            group = new DebugBilinearGroup(securityParameter, BilinearGroup.Type.TYPE_1);
+            group = new DebugBilinearGroup(RandomGenerator.getRandomPrime(securityParameter), BilinearGroup.Type.TYPE_1);
         } else {
             group = new SupersingularBilinearGroup(securityParameter);
         }

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/small/ABECPWat11Small.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/small/ABECPWat11Small.java
@@ -10,10 +10,9 @@
 import org.cryptimeleon.craco.enc.CipherText;
 import org.cryptimeleon.craco.enc.DecryptionKey;
 import org.cryptimeleon.craco.enc.EncryptionKey;
-
 import org.cryptimeleon.craco.secretsharing.accessstructure.MonotoneSpanProgram;
-import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.serialization.Representation;
+import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.structures.rings.zn.Zp;
 import org.cryptimeleon.math.structures.rings.zn.Zp.ZpElement;
 import org.cryptimeleon.predenc.MasterSecret;

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/small/ABECPWat11SmallCipherText.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/small/ABECPWat11SmallCipherText.java
@@ -2,10 +2,10 @@
 
 import org.cryptimeleon.craco.common.policies.Policy;
 import org.cryptimeleon.craco.enc.CipherText;
-import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.math.serialization.annotations.ReprUtil;
 import org.cryptimeleon.math.serialization.annotations.Represented;
+import org.cryptimeleon.math.structures.groups.GroupElement;
 
 import java.math.BigInteger;
 import java.util.Map;

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/small/ABECPWat11SmallDecryptionKey.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/small/ABECPWat11SmallDecryptionKey.java
@@ -4,10 +4,10 @@
 import org.cryptimeleon.craco.common.attributes.SetOfAttributes;
 import org.cryptimeleon.craco.common.predicate.KeyIndex;
 import org.cryptimeleon.craco.enc.DecryptionKey;
-import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.math.serialization.annotations.ReprUtil;
 import org.cryptimeleon.math.serialization.annotations.Represented;
+import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.predenc.MasterSecret;
 
 import java.util.Map;

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/small/ABECPWat11SmallEncryptionKey.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/small/ABECPWat11SmallEncryptionKey.java
@@ -3,9 +3,9 @@
 import org.cryptimeleon.craco.common.policies.Policy;
 import org.cryptimeleon.craco.common.predicate.CiphertextIndex;
 import org.cryptimeleon.craco.enc.EncryptionKey;
+import org.cryptimeleon.math.hash.ByteAccumulator;
 import org.cryptimeleon.math.hash.annotations.AnnotatedUbrUtil;
 import org.cryptimeleon.math.hash.annotations.UniqueByteRepresented;
-import org.cryptimeleon.math.hash.ByteAccumulator;
 import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.math.serialization.annotations.ReprUtil;
 import org.cryptimeleon.math.serialization.annotations.Represented;

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/small/ABECPWat11SmallMasterSecret.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/small/ABECPWat11SmallMasterSecret.java
@@ -1,10 +1,10 @@
 package org.cryptimeleon.predenc.abe.cp.small;
 
-import org.cryptimeleon.math.structures.groups.Group;
-import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.math.serialization.annotations.ReprUtil;
 import org.cryptimeleon.math.serialization.annotations.Represented;
+import org.cryptimeleon.math.structures.groups.Group;
+import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.predenc.MasterSecret;
 
 import java.util.Objects;

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/small/ABECPWat11SmallPublicParameters.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/small/ABECPWat11SmallPublicParameters.java
@@ -2,13 +2,13 @@
 
 import org.cryptimeleon.craco.common.PublicParameters;
 import org.cryptimeleon.craco.common.attributes.Attribute;
+import org.cryptimeleon.math.serialization.Representation;
+import org.cryptimeleon.math.serialization.annotations.ReprUtil;
+import org.cryptimeleon.math.serialization.annotations.Represented;
 import org.cryptimeleon.math.structures.groups.Group;
 import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.structures.groups.elliptic.BilinearGroup;
 import org.cryptimeleon.math.structures.groups.elliptic.BilinearMap;
-import org.cryptimeleon.math.serialization.Representation;
-import org.cryptimeleon.math.serialization.annotations.ReprUtil;
-import org.cryptimeleon.math.serialization.annotations.Represented;
 
 import java.util.Collections;
 import java.util.Map;

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/small/ABECPWat11SmallSetup.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/small/ABECPWat11SmallSetup.java
@@ -1,6 +1,7 @@
 package org.cryptimeleon.predenc.abe.cp.small;
 
 import org.cryptimeleon.craco.common.attributes.Attribute;
+import org.cryptimeleon.math.random.RandomGenerator;
 import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.structures.groups.debug.DebugBilinearGroup;
 import org.cryptimeleon.math.structures.groups.elliptic.BilinearGroup;
@@ -34,7 +35,7 @@ public class ABECPWat11SmallSetup {
     public void doKeyGen(int securityParameter, Collection<? extends Attribute> universe, boolean debug) {
         BilinearGroup group;
         if (debug) {
-            group = new DebugBilinearGroup(securityParameter, BilinearGroup.Type.TYPE_1);
+            group = new DebugBilinearGroup(RandomGenerator.getRandomPrime(securityParameter), BilinearGroup.Type.TYPE_1);
         } else {
             group = new SupersingularBilinearGroup(securityParameter);
         }

diff --git a/src/main/java/org/cryptimeleon/predenc/abe/cp/small/asymmetric/ABECPWat11AsymSmall.java b/src/main/java/org/cryptimeleon/predenc/abe/cp/small/asymmetric/ABECPWat11AsymSmall.java
@@ -10,10 +10,9 @@
 import org.cryptimeleon.craco.enc.CipherText;
 import org.cryptimeleon.craco.enc.DecryptionKey;
 import org.cryptimeleon.craco.enc.EncryptionKey;
-
 import org.cryptimeleon.craco.secretsharing.accessstructure.MonotoneSpanProgram;
-import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.serialization.Representation;
+import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.structures.rings.zn.Zp;
 import org.cryptimeleon.math.structures.rings.zn.Zp.ZpElement;
 import org.cryptimeleon.predenc.MasterSecret;

diff --git a/.../java/org/cryptimeleon/predenc/abe/cp/small/asymmetric/ABECPWat11AsymSmallCipherText.java b/.../java/org/cryptimeleon/predenc/abe/cp/small/asymmetric/ABECPWat11AsymSmallCipherText.java
@@ -2,10 +2,10 @@
 
 import org.cryptimeleon.craco.common.policies.Policy;
 import org.cryptimeleon.craco.enc.CipherText;
-import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.math.serialization.annotations.ReprUtil;
 import org.cryptimeleon.math.serialization.annotations.Represented;
+import org.cryptimeleon.math.structures.groups.GroupElement;
 
 import java.math.BigInteger;
 import java.util.Map;

diff --git a/...va/org/cryptimeleon/predenc/abe/cp/small/asymmetric/ABECPWat11AsymSmallDecryptionKey.java b/...va/org/cryptimeleon/predenc/abe/cp/small/asymmetric/ABECPWat11AsymSmallDecryptionKey.java
@@ -2,11 +2,11 @@
 
 import org.cryptimeleon.craco.common.attributes.Attribute;
 import org.cryptimeleon.craco.enc.DecryptionKey;
-import org.cryptimeleon.math.structures.groups.Group;
-import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.math.serialization.annotations.ReprUtil;
 import org.cryptimeleon.math.serialization.annotations.Represented;
+import org.cryptimeleon.math.structures.groups.Group;
+import org.cryptimeleon.math.structures.groups.GroupElement;
 
 import java.util.Map;
 import java.util.Objects;

diff --git a/...va/org/cryptimeleon/predenc/abe/cp/small/asymmetric/ABECPWat11AsymSmallEncryptionKey.java b/...va/org/cryptimeleon/predenc/abe/cp/small/asymmetric/ABECPWat11AsymSmallEncryptionKey.java
@@ -2,8 +2,8 @@
 
 import org.cryptimeleon.craco.common.policies.Policy;
 import org.cryptimeleon.craco.enc.EncryptionKey;
-import org.cryptimeleon.math.hash.annotations.AnnotatedUbrUtil;
 import org.cryptimeleon.math.hash.ByteAccumulator;
+import org.cryptimeleon.math.hash.annotations.AnnotatedUbrUtil;
 import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.math.serialization.annotations.ReprUtil;
 import org.cryptimeleon.math.serialization.annotations.Represented;

diff --git a/...ava/org/cryptimeleon/predenc/abe/cp/small/asymmetric/ABECPWat11AsymSmallMasterSecret.java b/...ava/org/cryptimeleon/predenc/abe/cp/small/asymmetric/ABECPWat11AsymSmallMasterSecret.java
@@ -1,10 +1,10 @@
 package org.cryptimeleon.predenc.abe.cp.small.asymmetric;
 
-import org.cryptimeleon.math.structures.groups.Group;
-import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.serialization.Representation;
 import org.cryptimeleon.math.serialization.annotations.ReprUtil;
 import org.cryptimeleon.math.serialization.annotations.Represented;
+import org.cryptimeleon.math.structures.groups.Group;
+import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.predenc.MasterSecret;
 
 import java.util.Objects;

diff --git a/...org/cryptimeleon/predenc/abe/cp/small/asymmetric/ABECPWat11AsymSmallPublicParameters.java b/...org/cryptimeleon/predenc/abe/cp/small/asymmetric/ABECPWat11AsymSmallPublicParameters.java
@@ -2,13 +2,13 @@
 
 import org.cryptimeleon.craco.common.PublicParameters;
 import org.cryptimeleon.craco.common.attributes.Attribute;
+import org.cryptimeleon.math.serialization.Representation;
+import org.cryptimeleon.math.serialization.annotations.ReprUtil;
+import org.cryptimeleon.math.serialization.annotations.Represented;
 import org.cryptimeleon.math.structures.groups.Group;
 import org.cryptimeleon.math.structures.groups.GroupElement;
 import org.cryptimeleon.math.structures.groups.elliptic.BilinearGroup;
 import org.cryptimeleon.math.structures.groups.elliptic.BilinearMap;
-import org.cryptimeleon.math.serialization.Representation;
-import org.cryptimeleon.math.serialization.annotations.ReprUtil;
-import org.cryptimeleon.math.serialization.annotations.Represented;
 
 import java.util.Map;
 import java.util.Objects;