From 698555022516311c1195a211f4688aa194ae3786 Mon Sep 17 00:00:00 2001 From: AndrewQuijano Date: Wed, 29 Oct 2025 18:31:57 -0400 Subject: [PATCH] Bump to Ciphercraft v1.0.7 --- LICENSE | 2 +- REU2017/app/build.gradle | 24 ++++++++++++++++--- .../localization/ClientThread.java | 16 ++++++------- .../localization/KeyMaster.java | 14 +++++------ .../localization/background.java | 14 +++++------ .../ui/MainActivity.java | 2 +- REU2017/build.gradle | 2 +- REUServer/build.gradle | 17 +++++++------ .../LocalizationThread.java | 10 ++++---- .../distance_computation/Distance.java | 4 ++-- .../distance_computation/DistanceDGK.java | 8 +++---- .../DistancePaillier.java | 8 +++---- .../distance_computation/DistancePlain.java | 2 +- .../structs/LocalizationResult.java | 22 ++++++++--------- .../structs/SendLocalizationData.java | 8 +++---- .../PlainTestDistanceTest.java | 4 ++-- .../mock_localize_client.java | 16 ++++++------- 17 files changed, 97 insertions(+), 76 deletions(-) diff --git a/LICENSE b/LICENSE index 6edc337..23306d5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 Andrew +Copyright (c) 2017 ADWISE Lab - Florida International University Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/REU2017/app/build.gradle b/REU2017/app/build.gradle index b9d01b8..bbe5bea 100644 --- a/REU2017/app/build.gradle +++ b/REU2017/app/build.gradle @@ -47,9 +47,9 @@ dependencies implementation 'com.github.chrisbanes:PhotoView:2.3.0' testImplementation 'junit:junit:4.13.2' // https://mvnrepository.com/artifact/io.github.andrewquijano/ciphercraft - implementation 'io.github.andrewquijano:ciphercraft:1.0.6' - // https://mvnrepository.com/artifact/io.github.andrewquijano/fingerprint_localization - implementation 'io.github.andrewquijano:fingerprint_localization:1.0.0' + implementation 'io.github.andrewquijano:ciphercraft:1.0.7' + // https://mvnrepository.com/artifact/io.github.andrewquijano/fingerprint-indoor-localization + implementation 'io.github.andrewquijano:fingerprint-indoor-localization:1.0.3' } java { toolchain { @@ -57,6 +57,24 @@ java { } } +tasks.register('generateJavadoc', Javadoc) { + source = android.sourceSets.main.java.srcDirs + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) + // If you're using libraries, you might need to add them to the classpath as well + // For example, to include all compile dependencies: + // Corrected line: + classpath += configurations.getByName("compileClasspath") // Or use implementation dependencies directly + + // A more modern approach for Android libraries is often to use the 'implementation' configuration + // If the above still causes issues, try: + // classpath += configurations.implementation.get().files + + // Exclude generated files like R.java and BuildConfig.java + exclude '**/R.java', '**/BuildConfig.java' + // You can set Javadoc options here if needed + // options.windowTitle = "My Awesome App API" +} + repositories { maven { url = uri('https://maven.google.com/') // Corrected: use '=' and uri() diff --git a/REU2017/app/src/main/java/edu/fiu/adwise/fingerprint_localization/localization/ClientThread.java b/REU2017/app/src/main/java/edu/fiu/adwise/fingerprint_localization/localization/ClientThread.java index 21562f8..b9f4972 100644 --- a/REU2017/app/src/main/java/edu/fiu/adwise/fingerprint_localization/localization/ClientThread.java +++ b/REU2017/app/src/main/java/edu/fiu/adwise/fingerprint_localization/localization/ClientThread.java @@ -13,7 +13,7 @@ import edu.fiu.adwise.fingerprint_localization.structs.SendLocalizationData; import edu.fiu.adwise.fingerprint_localization.structs.LocalizationResult; import edu.fiu.adwise.fingerprint_localization.structs.SendTrainingData; -import edu.fiu.adwise.homomorphic_encryption.misc.HomomorphicException; +import edu.fiu.adwise.ciphercraft.misc.HomomorphicException; import edu.fiu.adwise.fingerprint_localization.ui.MainActivity; import edu.fiu.adwise.fingerprint_localization.ui.TrainActivity; @@ -22,13 +22,13 @@ import static edu.fiu.adwise.fingerprint_localization.ui.MainActivity.portNumber; import edu.fiu.adwise.fingerprint_localization.distance_computation.LOCALIZATION_SCHEME; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKOperations; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKPrivateKey; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKPublicKey; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierCipher; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierPrivateKey; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierPublicKey; -import edu.fiu.adwise.homomorphic_encryption.socialistmillionaire.bob; +import edu.fiu.adwise.ciphercraft.dgk.DGKOperations; +import edu.fiu.adwise.ciphercraft.dgk.DGKPrivateKey; +import edu.fiu.adwise.ciphercraft.dgk.DGKPublicKey; +import edu.fiu.adwise.ciphercraft.paillier.PaillierCipher; +import edu.fiu.adwise.ciphercraft.paillier.PaillierPrivateKey; +import edu.fiu.adwise.ciphercraft.paillier.PaillierPublicKey; +import edu.fiu.adwise.ciphercraft.socialistmillionaire.bob; public class ClientThread implements Runnable { private final static String TAG = "CLIENT_THREAD"; diff --git a/REU2017/app/src/main/java/edu/fiu/adwise/fingerprint_localization/localization/KeyMaster.java b/REU2017/app/src/main/java/edu/fiu/adwise/fingerprint_localization/localization/KeyMaster.java index be7d6d3..b46d8ed 100644 --- a/REU2017/app/src/main/java/edu/fiu/adwise/fingerprint_localization/localization/KeyMaster.java +++ b/REU2017/app/src/main/java/edu/fiu/adwise/fingerprint_localization/localization/KeyMaster.java @@ -5,13 +5,13 @@ import java.security.KeyPair; import java.security.SecureRandom; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKKeyPairGenerator; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKPrivateKey; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKPublicKey; -import edu.fiu.adwise.homomorphic_encryption.misc.HomomorphicException; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierKeyPairGenerator; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierPrivateKey; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierPublicKey; +import edu.fiu.adwise.ciphercraft.dgk.DGKKeyPairGenerator; +import edu.fiu.adwise.ciphercraft.dgk.DGKPrivateKey; +import edu.fiu.adwise.ciphercraft.dgk.DGKPublicKey; +import edu.fiu.adwise.ciphercraft.misc.HomomorphicException; +import edu.fiu.adwise.ciphercraft.paillier.PaillierKeyPairGenerator; +import edu.fiu.adwise.ciphercraft.paillier.PaillierPrivateKey; +import edu.fiu.adwise.ciphercraft.paillier.PaillierPublicKey; public final class KeyMaster implements Runnable { private final static int KEY_SIZE = 2048; diff --git a/REU2017/app/src/main/java/edu/fiu/adwise/fingerprint_localization/localization/background.java b/REU2017/app/src/main/java/edu/fiu/adwise/fingerprint_localization/localization/background.java index 1080bdf..1cb3cec 100644 --- a/REU2017/app/src/main/java/edu/fiu/adwise/fingerprint_localization/localization/background.java +++ b/REU2017/app/src/main/java/edu/fiu/adwise/fingerprint_localization/localization/background.java @@ -24,15 +24,15 @@ import edu.fiu.adwise.fingerprint_localization.distance_computation.LOCALIZATION_SCHEME; import edu.fiu.adwise.fingerprint_localization.structs.SendLocalizationData; import edu.fiu.adwise.fingerprint_localization.structs.LocalizationResult; -import edu.fiu.adwise.homomorphic_encryption.misc.HomomorphicException; +import edu.fiu.adwise.ciphercraft.misc.HomomorphicException; import edu.fiu.adwise.fingerprint_localization.ui.MainActivity; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKOperations; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKPrivateKey; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKPublicKey; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierCipher; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierPrivateKey; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierPublicKey; +import edu.fiu.adwise.ciphercraft.dgk.DGKOperations; +import edu.fiu.adwise.ciphercraft.dgk.DGKPrivateKey; +import edu.fiu.adwise.ciphercraft.dgk.DGKPublicKey; +import edu.fiu.adwise.ciphercraft.paillier.PaillierCipher; +import edu.fiu.adwise.ciphercraft.paillier.PaillierPrivateKey; +import edu.fiu.adwise.ciphercraft.paillier.PaillierPublicKey; import static android.graphics.Color.RED; import static edu.fiu.adwise.fingerprint_localization.distance_computation.LOCALIZATION_SCHEME.*; diff --git a/REU2017/app/src/main/java/edu/fiu/adwise/fingerprint_localization/ui/MainActivity.java b/REU2017/app/src/main/java/edu/fiu/adwise/fingerprint_localization/ui/MainActivity.java index 7d9f221..f9162e3 100644 --- a/REU2017/app/src/main/java/edu/fiu/adwise/fingerprint_localization/ui/MainActivity.java +++ b/REU2017/app/src/main/java/edu/fiu/adwise/fingerprint_localization/ui/MainActivity.java @@ -24,7 +24,7 @@ import edu.fiu.adwise.fingerprint_localization.localization.ClientThread; import edu.fiu.adwise.fingerprint_localization.localization.KeyMaster; -import edu.fiu.adwise.homomorphic_encryption.misc.HomomorphicException; +import edu.fiu.adwise.ciphercraft.misc.HomomorphicException; import edu.fiu.adwise.fingerprint_localization.sensors.WifiReceiver; import static edu.fiu.reu2017.R.*; diff --git a/REU2017/build.gradle b/REU2017/build.gradle index f03a2e8..ba94f50 100644 --- a/REU2017/build.gradle +++ b/REU2017/build.gradle @@ -7,7 +7,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:8.12.1' + classpath 'com.android.tools.build:gradle:8.13.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/REUServer/build.gradle b/REUServer/build.gradle index 6b70e1e..7bf3e02 100644 --- a/REUServer/build.gradle +++ b/REUServer/build.gradle @@ -37,7 +37,7 @@ dependencies { implementation 'com.mysql:mysql-connector-j:9.3.0' // https://mvnrepository.com/artifact/io.github.andrewquijano/ciphercraft - implementation 'io.github.andrewquijano:ciphercraft:1.0.6' + implementation 'io.github.andrewquijano:ciphercraft:1.0.7' // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api implementation 'org.apache.logging.log4j:log4j-core:2.24.3' @@ -89,9 +89,9 @@ publishing { from components.java pom { - name.set('fingerprint_localization') + name.set('Privacy-Preserving Indoor Localization using Wi-Fi Fingerprinting') description.set('This package is the JAR file used for secure indoor localization using Wi-Fi fingerprints. ' + - 'This utilizes homomorphic encryption to preserve privacy') + 'This utilizes homomorphic encryption to preserve privacy.') url.set('https://github.com/adwise-fiu/Secure_Indoor_Localization') licenses { @@ -101,16 +101,19 @@ publishing { } } + organization { + name.set('ADWISE Research Lab, Florida International University') + url.set('https://adwise.fiu.edu/') + } + developers { developer { id.set('AndrewQuijano') name.set('Andrew Quijano') email.set('andrew.quijano@nyu.edu') roles.add('Lead Developer') - organization { - name.set('New York University') - url.set('https://www.nyu.edu') - } + organization.set('New York University') + organizationUrl.set('https://www.nyu.edu') } } diff --git a/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/LocalizationThread.java b/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/LocalizationThread.java index 8d694fe..b5d83ea 100644 --- a/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/LocalizationThread.java +++ b/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/LocalizationThread.java @@ -25,11 +25,11 @@ import edu.fiu.adwise.fingerprint_localization.structs.SendTrainingData; import edu.fiu.adwise.fingerprint_localization.database.LocalizationLUT; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKPublicKey; -import edu.fiu.adwise.homomorphic_encryption.elgamal.ElGamalPublicKey; -import edu.fiu.adwise.homomorphic_encryption.misc.HomomorphicException; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierPublicKey; -import edu.fiu.adwise.homomorphic_encryption.socialistmillionaire.alice; +import edu.fiu.adwise.ciphercraft.dgk.DGKPublicKey; +import edu.fiu.adwise.ciphercraft.elgamal.ElGamalPublicKey; +import edu.fiu.adwise.ciphercraft.misc.HomomorphicException; +import edu.fiu.adwise.ciphercraft.paillier.PaillierPublicKey; +import edu.fiu.adwise.ciphercraft.socialistmillionaire.alice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/distance_computation/Distance.java b/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/distance_computation/Distance.java index fe088f9..7c85c80 100644 --- a/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/distance_computation/Distance.java +++ b/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/distance_computation/Distance.java @@ -7,8 +7,8 @@ import java.util.List; import edu.fiu.adwise.fingerprint_localization.structs.LocalizationResult; -import edu.fiu.adwise.homomorphic_encryption.misc.HomomorphicException; -import edu.fiu.adwise.homomorphic_encryption.socialistmillionaire.alice; +import edu.fiu.adwise.ciphercraft.misc.HomomorphicException; +import edu.fiu.adwise.ciphercraft.socialistmillionaire.alice; /** * Abstract base class for distance computation in Wi-Fi fingerprint localization. diff --git a/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/distance_computation/DistanceDGK.java b/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/distance_computation/DistanceDGK.java index aa9474f..396793e 100644 --- a/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/distance_computation/DistanceDGK.java +++ b/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/distance_computation/DistanceDGK.java @@ -8,10 +8,10 @@ import edu.fiu.adwise.fingerprint_localization.database.LocalizationLUT; import edu.fiu.adwise.fingerprint_localization.structs.LocalizationResult; import edu.fiu.adwise.fingerprint_localization.structs.SendLocalizationData; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKOperations; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKPublicKey; -import edu.fiu.adwise.homomorphic_encryption.misc.HomomorphicException; -import edu.fiu.adwise.homomorphic_encryption.socialistmillionaire.alice; +import edu.fiu.adwise.ciphercraft.dgk.DGKOperations; +import edu.fiu.adwise.ciphercraft.dgk.DGKPublicKey; +import edu.fiu.adwise.ciphercraft.misc.HomomorphicException; +import edu.fiu.adwise.ciphercraft.socialistmillionaire.alice; /** diff --git a/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/distance_computation/DistancePaillier.java b/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/distance_computation/DistancePaillier.java index 5463dac..775f608 100644 --- a/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/distance_computation/DistancePaillier.java +++ b/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/distance_computation/DistancePaillier.java @@ -8,10 +8,10 @@ import edu.fiu.adwise.fingerprint_localization.database.LocalizationLUT; import edu.fiu.adwise.fingerprint_localization.structs.LocalizationResult; import edu.fiu.adwise.fingerprint_localization.structs.SendLocalizationData; -import edu.fiu.adwise.homomorphic_encryption.misc.HomomorphicException; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierCipher; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierPublicKey; -import edu.fiu.adwise.homomorphic_encryption.socialistmillionaire.alice; +import edu.fiu.adwise.ciphercraft.misc.HomomorphicException; +import edu.fiu.adwise.ciphercraft.paillier.PaillierCipher; +import edu.fiu.adwise.ciphercraft.paillier.PaillierPublicKey; +import edu.fiu.adwise.ciphercraft.socialistmillionaire.alice; /** diff --git a/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/distance_computation/DistancePlain.java b/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/distance_computation/DistancePlain.java index 5781581..11b0c9f 100644 --- a/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/distance_computation/DistancePlain.java +++ b/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/distance_computation/DistancePlain.java @@ -9,7 +9,7 @@ import edu.fiu.adwise.fingerprint_localization.database.LocalizationLUT; import edu.fiu.adwise.fingerprint_localization.structs.LocalizationResult; import edu.fiu.adwise.fingerprint_localization.structs.SendLocalizationData; -import edu.fiu.adwise.homomorphic_encryption.socialistmillionaire.alice; +import edu.fiu.adwise.ciphercraft.socialistmillionaire.alice; /** * Implements plaintext distance computation for Wi-Fi fingerprint localization. diff --git a/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/structs/LocalizationResult.java b/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/structs/LocalizationResult.java index 3bf242a..2ee0218 100644 --- a/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/structs/LocalizationResult.java +++ b/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/structs/LocalizationResult.java @@ -4,17 +4,17 @@ import java.io.Serializable; import java.math.BigInteger; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKOperations; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKPrivateKey; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKPublicKey; -import edu.fiu.adwise.homomorphic_encryption.elgamal.ElGamalCipher; -import edu.fiu.adwise.homomorphic_encryption.elgamal.ElGamalPrivateKey; -import edu.fiu.adwise.homomorphic_encryption.elgamal.ElGamalPublicKey; -import edu.fiu.adwise.homomorphic_encryption.elgamal.ElGamal_Ciphertext; -import edu.fiu.adwise.homomorphic_encryption.misc.HomomorphicException; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierCipher; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierPrivateKey; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierPublicKey; +import edu.fiu.adwise.ciphercraft.dgk.DGKOperations; +import edu.fiu.adwise.ciphercraft.dgk.DGKPrivateKey; +import edu.fiu.adwise.ciphercraft.dgk.DGKPublicKey; +import edu.fiu.adwise.ciphercraft.elgamal.ElGamalCipher; +import edu.fiu.adwise.ciphercraft.elgamal.ElGamalPrivateKey; +import edu.fiu.adwise.ciphercraft.elgamal.ElGamalPublicKey; +import edu.fiu.adwise.ciphercraft.elgamal.ElGamal_Ciphertext; +import edu.fiu.adwise.ciphercraft.misc.HomomorphicException; +import edu.fiu.adwise.ciphercraft.paillier.PaillierCipher; +import edu.fiu.adwise.ciphercraft.paillier.PaillierPrivateKey; +import edu.fiu.adwise.ciphercraft.paillier.PaillierPublicKey; /** * Implements distance computation for Wi-Fi fingerprint localization using Paillier homomorphic encryption. diff --git a/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/structs/SendLocalizationData.java b/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/structs/SendLocalizationData.java index aa29f9d..aceacf7 100644 --- a/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/structs/SendLocalizationData.java +++ b/REUServer/src/main/java/edu/fiu/adwise/fingerprint_localization/structs/SendLocalizationData.java @@ -5,10 +5,10 @@ import java.util.List; import edu.fiu.adwise.fingerprint_localization.distance_computation.LOCALIZATION_SCHEME; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKPublicKey; -import edu.fiu.adwise.homomorphic_encryption.elgamal.ElGamalPublicKey; -import edu.fiu.adwise.homomorphic_encryption.elgamal.ElGamal_Ciphertext; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierPublicKey; +import edu.fiu.adwise.ciphercraft.dgk.DGKPublicKey; +import edu.fiu.adwise.ciphercraft.elgamal.ElGamalPublicKey; +import edu.fiu.adwise.ciphercraft.elgamal.ElGamal_Ciphertext; +import edu.fiu.adwise.ciphercraft.paillier.PaillierPublicKey; /** * Represents a data structure for transmitting localization data between client and server. diff --git a/REUServer/src/test/java/edu/fiu/adwise/fingerprint_tests/PlainTestDistanceTest.java b/REUServer/src/test/java/edu/fiu/adwise/fingerprint_tests/PlainTestDistanceTest.java index f3cae34..cd30674 100644 --- a/REUServer/src/test/java/edu/fiu/adwise/fingerprint_tests/PlainTestDistanceTest.java +++ b/REUServer/src/test/java/edu/fiu/adwise/fingerprint_tests/PlainTestDistanceTest.java @@ -4,8 +4,8 @@ import edu.fiu.adwise.fingerprint_localization.server; import edu.fiu.adwise.fingerprint_localization.structs.SendLocalizationData; import edu.fiu.adwise.fingerprint_localization.structs.SendTrainingData; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKKeyPairGenerator; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKPublicKey; +import edu.fiu.adwise.ciphercraft.dgk.DGKKeyPairGenerator; +import edu.fiu.adwise.ciphercraft.dgk.DGKPublicKey; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.BeforeClass; diff --git a/REUServer/src/test/java/edu/fiu/adwise/fingerprint_tests/mock_localize_client.java b/REUServer/src/test/java/edu/fiu/adwise/fingerprint_tests/mock_localize_client.java index b003509..c2af7f0 100644 --- a/REUServer/src/test/java/edu/fiu/adwise/fingerprint_tests/mock_localize_client.java +++ b/REUServer/src/test/java/edu/fiu/adwise/fingerprint_tests/mock_localize_client.java @@ -12,14 +12,14 @@ import edu.fiu.adwise.fingerprint_localization.distance_computation.LOCALIZATION_SCHEME; import edu.fiu.adwise.fingerprint_localization.structs.LocalizationResult; import edu.fiu.adwise.fingerprint_localization.structs.SendLocalizationData; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKKeyPairGenerator; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKOperations; -import edu.fiu.adwise.homomorphic_encryption.dgk.DGKPrivateKey; -import edu.fiu.adwise.homomorphic_encryption.misc.HomomorphicException; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierCipher; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierKeyPairGenerator; -import edu.fiu.adwise.homomorphic_encryption.paillier.PaillierPrivateKey; -import edu.fiu.adwise.homomorphic_encryption.socialistmillionaire.bob; +import edu.fiu.adwise.ciphercraft.dgk.DGKKeyPairGenerator; +import edu.fiu.adwise.ciphercraft.dgk.DGKOperations; +import edu.fiu.adwise.ciphercraft.dgk.DGKPrivateKey; +import edu.fiu.adwise.ciphercraft.misc.HomomorphicException; +import edu.fiu.adwise.ciphercraft.paillier.PaillierCipher; +import edu.fiu.adwise.ciphercraft.paillier.PaillierKeyPairGenerator; +import edu.fiu.adwise.ciphercraft.paillier.PaillierPrivateKey; +import edu.fiu.adwise.ciphercraft.socialistmillionaire.bob; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger;