Fix #529: Fix typo in the error message (#530)

Optimize imports (cherry picked from commit 504c9a4)
wultra · Sep 7, 2023 · 82d24e0 · 82d24e0
1 parent 45fd928
commit 82d24e0
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/...ava/io/getlime/security/powerauth/crypto/client/activation/PowerAuthClientActivation.java b/...ava/io/getlime/security/powerauth/crypto/client/activation/PowerAuthClientActivation.java
@@ -28,10 +28,8 @@
 import java.nio.charset.StandardCharsets;
 import java.security.InvalidKeyException;
 import java.security.KeyPair;
-import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.interfaces.ECPublicKey;
-import java.security.spec.InvalidKeySpecException;
 import java.util.Arrays;
 import java.util.Base64;
 

diff --git a/...src/main/java/io/getlime/security/powerauth/crypto/client/vault/PowerAuthClientVault.java b/...src/main/java/io/getlime/security/powerauth/crypto/client/vault/PowerAuthClientVault.java
@@ -16,7 +16,6 @@
  */
 package io.getlime.security.powerauth.crypto.client.vault;
 
-import io.getlime.security.powerauth.crypto.lib.generator.KeyGenerator;
 import io.getlime.security.powerauth.crypto.lib.model.exception.CryptoProviderException;
 import io.getlime.security.powerauth.crypto.lib.model.exception.GenericCryptoException;
 import io.getlime.security.powerauth.crypto.lib.util.AESEncryptionUtils;

diff --git a/...to/src/main/java/io/getlime/security/powerauth/crypto/lib/encryptor/EncryptorFactory.java b/...to/src/main/java/io/getlime/security/powerauth/crypto/lib/encryptor/EncryptorFactory.java
@@ -22,9 +22,9 @@
 import io.getlime.security.powerauth.crypto.lib.encryptor.ecies.ServerEciesEncryptor;
 import io.getlime.security.powerauth.crypto.lib.encryptor.exception.EncryptorException;
 import io.getlime.security.powerauth.crypto.lib.encryptor.model.EncryptorId;
+import io.getlime.security.powerauth.crypto.lib.encryptor.model.EncryptorParameters;
 import io.getlime.security.powerauth.crypto.lib.encryptor.model.EncryptorScope;
 import io.getlime.security.powerauth.crypto.lib.encryptor.model.EncryptorSecrets;
-import io.getlime.security.powerauth.crypto.lib.encryptor.model.EncryptorParameters;
 
 /**
  * The {@code EncryptorFactory} class provide high level encryptors for PowerAuth End-To-End encryption implementation.

diff --git a/...rc/main/java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/EciesEncryptor.java b/...rc/main/java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/EciesEncryptor.java
@@ -23,7 +23,10 @@
 import io.getlime.security.powerauth.crypto.lib.generator.KeyGenerator;
 import io.getlime.security.powerauth.crypto.lib.model.exception.CryptoProviderException;
 import io.getlime.security.powerauth.crypto.lib.model.exception.GenericCryptoException;
-import io.getlime.security.powerauth.crypto.lib.util.*;
+import io.getlime.security.powerauth.crypto.lib.util.AESEncryptionUtils;
+import io.getlime.security.powerauth.crypto.lib.util.EciesUtils;
+import io.getlime.security.powerauth.crypto.lib.util.HMACHashUtilities;
+import io.getlime.security.powerauth.crypto.lib.util.KeyConvertor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/.../java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/model/EciesCryptogram.java b/.../java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/model/EciesCryptogram.java
@@ -16,7 +16,9 @@
  */
 package io.getlime.security.powerauth.crypto.lib.encryptor.ecies.model;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Value;
 
 /**
  * The EciesCryptogram structure represents cryptogram transmitted over the network.

diff --git a/.../java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/model/EciesParameters.java b/.../java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/model/EciesParameters.java
@@ -16,7 +16,9 @@
  */
 package io.getlime.security.powerauth.crypto.lib.encryptor.ecies.model;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Value;
 
 /**
  * The EciesParameters structure represents additional ECIES parameters transmitted over the network.

diff --git a/...h-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/util/EciesUtils.java b/...h-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/util/EciesUtils.java
@@ -18,8 +18,6 @@
 
 import io.getlime.security.powerauth.crypto.lib.encryptor.ecies.exception.EciesException;
 import io.getlime.security.powerauth.crypto.lib.encryptor.model.EncryptorScope;
-import io.getlime.security.powerauth.crypto.lib.model.exception.CryptoProviderException;
-import io.getlime.security.powerauth.crypto.lib.model.exception.GenericCryptoException;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -137,7 +135,7 @@ public static byte[] deriveSharedInfo2(String protocolVersion, byte[] sharedInfo
  throw new EciesException("Missing nonce parameter");
  }
  if (timestamp == null) {
- throw new EciesException("Missing nonce parameter");
+ throw new EciesException("Missing timestamp parameter");
  }
  if (associatedData == null) {
  throw new EciesException("Missing associatedData parameter");

diff --git a/...ava/io/getlime/security/powerauth/crypto/server/activation/PowerAuthServerActivation.java b/...ava/io/getlime/security/powerauth/crypto/server/activation/PowerAuthServerActivation.java
@@ -34,7 +34,6 @@
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.interfaces.ECPublicKey;
-import java.security.spec.InvalidKeySpecException;
 import java.util.Arrays;
 import java.util.Base64;