From 82d24e0ec49a52780ec68036c31ebc6c60228fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Dvo=C5=99=C3=A1k?= Date: Thu, 7 Sep 2023 12:00:42 +0200 Subject: [PATCH] Fix #529: Fix typo in the error message (#530) Optimize imports (cherry picked from commit 504c9a48a3318de8e46ddade350a125d98cad161) --- .../crypto/client/activation/PowerAuthClientActivation.java | 2 -- .../powerauth/crypto/client/vault/PowerAuthClientVault.java | 1 - .../powerauth/crypto/lib/encryptor/EncryptorFactory.java | 2 +- .../powerauth/crypto/lib/encryptor/ecies/EciesEncryptor.java | 5 ++++- .../crypto/lib/encryptor/ecies/model/EciesCryptogram.java | 4 +++- .../crypto/lib/encryptor/ecies/model/EciesParameters.java | 4 +++- .../security/powerauth/crypto/lib/util/EciesUtils.java | 4 +--- .../crypto/server/activation/PowerAuthServerActivation.java | 1 - 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/client/activation/PowerAuthClientActivation.java b/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/client/activation/PowerAuthClientActivation.java index a3be5e8a6..3826b3f89 100644 --- a/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/client/activation/PowerAuthClientActivation.java +++ b/powerauth-java-crypto/src/main/java/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/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/client/vault/PowerAuthClientVault.java b/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/client/vault/PowerAuthClientVault.java index f55c66baf..c35026df7 100644 --- a/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/client/vault/PowerAuthClientVault.java +++ b/powerauth-java-crypto/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/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/encryptor/EncryptorFactory.java b/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/encryptor/EncryptorFactory.java index 85098a789..949deabe5 100644 --- a/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/encryptor/EncryptorFactory.java +++ b/powerauth-java-crypto/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/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/EciesEncryptor.java b/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/EciesEncryptor.java index d17d430a8..f1218bada 100644 --- a/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/EciesEncryptor.java +++ b/powerauth-java-crypto/src/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/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/model/EciesCryptogram.java b/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/model/EciesCryptogram.java index a38d37125..d29eba2df 100644 --- a/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/model/EciesCryptogram.java +++ b/powerauth-java-crypto/src/main/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/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/model/EciesParameters.java b/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/model/EciesParameters.java index e6ee3fe30..e5d7d37dc 100644 --- a/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/encryptor/ecies/model/EciesParameters.java +++ b/powerauth-java-crypto/src/main/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/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/util/EciesUtils.java b/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/util/EciesUtils.java index 1cd3120cc..d1087cca3 100644 --- a/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/lib/util/EciesUtils.java +++ b/powerauth-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/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/server/activation/PowerAuthServerActivation.java b/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/server/activation/PowerAuthServerActivation.java index ebd75f0b1..9c99d0a34 100644 --- a/powerauth-java-crypto/src/main/java/io/getlime/security/powerauth/crypto/server/activation/PowerAuthServerActivation.java +++ b/powerauth-java-crypto/src/main/java/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;