From bc68e0433c7f40e1d07666b12d1803a76915b741 Mon Sep 17 00:00:00 2001 From: Leo Galambos Date: Thu, 30 Jul 2026 20:26:14 +0200 Subject: [PATCH] chore(import): fix invalid imports --- app/src/main/java/zeroecho/Guard.java | 2 +- app/src/main/java/zeroecho/Kem.java | 2 +- app/src/main/java/zeroecho/Tag.java | 2 +- .../covert/jpeg/JpegExifIntegrationTest.java | 2 +- .../zeroecho/core/alg/aes/AesCipherContext.java | 2 +- .../zeroecho/core/alg/bike/BikeAlgorithm.java | 2 +- .../zeroecho/core/alg/cmce/CmceAlgorithm.java | 2 +- .../zeroecho/core/alg/frodo/FrodoAlgorithm.java | 2 +- .../zeroecho/core/alg/hmac/HmacKeyImportSpec.java | 2 +- .../java/zeroecho/core/alg/hqc/HqcAlgorithm.java | 2 +- .../zeroecho/core/alg/kyber/KyberAlgorithm.java | 2 +- .../zeroecho/core/alg/ntru/NtruAlgorithm.java | 2 +- .../core/alg/ntruprime/NtrulPrimeAlgorithm.java | 2 +- .../core/alg/ntruprime/SntruPrimeAlgorithm.java | 2 +- .../zeroecho/core/alg/saber/SaberAlgorithm.java | 2 +- .../java/zeroecho/core/storage/KeyringStore.java | 6 +++--- .../java/zeroecho/core/tag/TagEngineBuilder.java | 2 +- .../main/java/zeroecho/sdk/ZeroEchoSession.java | 4 ++-- .../zeroecho/sdk/builders/HybridKexBuilder.java | 3 +-- .../SignatureTrailerDataContentBuilder.java | 3 +-- .../sdk/builders/alg/AesDataContentBuilder.java | 3 +-- .../builders/alg/ChaChaDataContentBuilder.java | 3 +-- .../builders/alg/DigestDataContentBuilder.java | 3 +-- .../alg/ElgamalEncDataContentBuilder.java | 3 +-- .../sdk/builders/alg/HmacDataContentBuilder.java | 3 +-- .../sdk/builders/alg/KemDataContentBuilder.java | 3 +-- .../builders/alg/RsaEncDataContentBuilder.java | 3 +-- .../builders/alg/RsaSigDataContentBuilder.java | 3 +-- .../sdk/content/builtin/SecretPassword.java | 2 +- .../java/zeroecho/sdk/guard/EncCtxOpener.java | 3 +-- .../main/java/zeroecho/sdk/guard/Encryptor.java | 2 +- .../java/zeroecho/sdk/guard/KemCtxOpener.java | 3 +-- .../zeroecho/sdk/guard/PasswordRecipient.java | 2 +- .../sdk/hybrid/kex/HybridKexContexts.java | 3 +-- .../hybrid/signature/HybridSignatureContext.java | 3 +-- .../core/CapabilityValueSemanticsTest.java | 4 ++-- .../java/zeroecho/core/CatalogContractTest.java | 4 +--- .../core/CryptoAlgorithmsAuditWrapTest.java | 2 -- .../zeroecho/core/CryptoArchitectureTest.java | 5 +---- .../zeroecho/core/SecretSpecLifecycleTest.java | 4 ++-- .../java/zeroecho/core/WrongKeySecurityTest.java | 4 +--- .../core/ZeroEchoSessionWrapIntegrationTest.java | 2 +- .../core/alg/aes/AesDecryptionSecurityTest.java | 1 - .../core/alg/aes/AesRandomSupportTest.java | 4 ++-- .../AgreementAlgorithmsRoundTripTest.java | 4 ++-- .../core/alg/elgamal/ElgamalLargeDataTest.java | 1 - .../zeroecho/core/alg/rsa/BlockGeometryTest.java | 1 - .../zeroecho/core/alg/rsa/RsaLargeDataTest.java | 1 - .../core/audit/AuditedContextsAccessorTest.java | 1 - .../core/audit/AuditedContextsRegressionTest.java | 3 --- .../java/zeroecho/core/marshal/PairSeqTest.java | 1 - .../storage/KeyringCryptographicFormatTest.java | 1 - .../core/storage/KeyringImportRegistryTest.java | 3 +-- .../sdk/ZeroEchoSessionDestroyKeyTest.java | 2 +- .../sdk/builders/HybridKexBuilderTest.java | 5 ++--- .../TagTrailerDataContentBuilderTest.java | 4 ++-- .../sdk/builders/alg/KemHybridRoundTripTest.java | 1 - .../sdk/guard/KemRecipientLifecycleTest.java | 2 +- .../sdk/guard/MultiRecipientEnvelopeTest.java | 1 - .../sdk/hybrid/kex/HybridKexFrameCodecTest.java | 2 +- .../zeroecho/sdk/hybrid/kex/HybridKexTest.java | 1 - .../sdk/hybrid/signature/HybridSignatureTest.java | 2 +- .../api/request/ParsedCertificationRequest.java | 2 +- .../pki/api/request/SubjectAlternativeName.java | 4 ++++ .../pki/api/revocation/RevocationJournal.java | 2 +- .../impl/core/CertificateProfileValidator.java | 5 ++--- .../zeroecho/pki/impl/core/DefaultCaService.java | 2 +- .../pki/impl/core/DefaultIssuanceService.java | 4 ++-- .../pki/impl/core/DefaultStatusObjectService.java | 2 +- .../impl/core/ValidatedCertificateRequest.java | 2 +- .../pki/impl/core/VerifiedIssuanceCandidate.java | 8 ++++---- .../zeroecholib/ZeroEchoLibSignatureWorkflow.java | 10 +++++----- .../x509/bc/BcX509CertificationRequestParser.java | 2 +- .../x509/bc/BcX509CredentialIssuerBackend.java | 6 +++--- .../framework/x509/bc/BcX509ProfileSupport.java | 2 +- .../x509/bc/BcX509ProofOfPossessionVerifier.java | 2 +- .../zeroecho/pki/impl/fs/FilesystemPkiStore.java | 6 +++--- .../main/java/zeroecho/pki/impl/fs/FsCodec.java | 2 +- .../main/java/zeroecho/pki/impl/fs/FsPaths.java | 2 +- .../pki/spi/crypto/SignatureWorkflowProvider.java | 2 +- .../pki/e2e/CaProfileIssuanceEnforcementTest.java | 9 ++++----- .../pki/e2e/H7EndEntityAcceptanceE2eTest.java | 10 +++++----- .../pki/e2e/H7EndEntityCsrRejectionE2eTest.java | 3 +-- .../java/zeroecho/pki/e2e/PkiCoreE2eTest.java | 14 ++++++-------- .../zeroecho/pki/e2e/PkiProofGateE2eTest.java | 6 +++--- .../impl/core/DefaultRevocationServiceTest.java | 2 +- .../core/DefaultStatusObjectServiceCrlTest.java | 7 ++----- .../pki/impl/core/H7ProfileEnforcementTest.java | 15 +++++---------- ...ckedEffectiveCredentialStatusResolverTest.java | 2 +- .../impl/core/async/PkiSigningBusFailureTest.java | 6 +++--- ...roEchoLibSignatureWorkflowPersistenceTest.java | 8 +++----- .../bc/WorkflowProofOfPossessionVerifierTest.java | 2 +- .../pki/impl/fs/FilesystemPkiStoreTest.java | 10 +++++----- .../impl/fs/FilesystemProfileLifecycleTest.java | 2 +- .../impl/fs/FilesystemRevocationJournalTest.java | 3 +-- .../impl/fs/FilesystemSignWorkflowStoreTest.java | 2 +- .../pki/spi/bootstrap/PkiBootstrapTest.java | 4 ++-- .../java/zeroecho/pki/testkit/PkiTestRuntime.java | 6 +++--- samples/src/test/java/demo/AesTest.java | 3 +-- .../src/test/java/demo/AgreementVariantsTest.java | 4 +--- .../src/test/java/demo/CombinedDeliveryTest.java | 4 ++-- .../test/java/demo/HybridDerivedAesDemoTest.java | 2 +- samples/src/test/java/demo/HybridKexDemoTest.java | 2 +- .../src/test/java/demo/HybridSigningAesTest.java | 2 +- samples/src/test/java/demo/PostQuantumTest.java | 2 +- samples/src/test/java/demo/SigningAesTest.java | 2 +- 106 files changed, 150 insertions(+), 203 deletions(-) diff --git a/app/src/main/java/zeroecho/Guard.java b/app/src/main/java/zeroecho/Guard.java index da52c65..d036ca9 100644 --- a/app/src/main/java/zeroecho/Guard.java +++ b/app/src/main/java/zeroecho/Guard.java @@ -58,6 +58,7 @@ import zeroecho.core.context.KemContext; import zeroecho.core.err.UnsupportedRoleException; import zeroecho.core.spi.KeyringUnlockProvider; import zeroecho.core.storage.KeyringStore; +import zeroecho.core.util.RandomSupport; import zeroecho.sdk.Pbkdf2Limits; import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.alg.AesDataContentBuilder; @@ -67,7 +68,6 @@ import zeroecho.sdk.guard.MultiRecipientContent; import zeroecho.sdk.guard.MultiRecipientDataSourceBuilder; import zeroecho.sdk.guard.RecipientKekSizes; import zeroecho.sdk.guard.UnlockMaterial; -import zeroecho.core.util.RandomSupport; /** * Guard is a unified subcommand that encrypts and decrypts using a diff --git a/app/src/main/java/zeroecho/Kem.java b/app/src/main/java/zeroecho/Kem.java index 8e8f96d..6d9d9d1 100644 --- a/app/src/main/java/zeroecho/Kem.java +++ b/app/src/main/java/zeroecho/Kem.java @@ -61,10 +61,10 @@ import zeroecho.core.CatalogSelector; import zeroecho.core.KeyUsage; import zeroecho.core.spi.KeyringUnlockProvider; import zeroecho.core.storage.KeyringStore; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.alg.AesDataContentBuilder; import zeroecho.sdk.builders.alg.ChaChaDataContentBuilder; import zeroecho.sdk.builders.alg.KemDataContentBuilder; -import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.core.DataContentChainBuilder; import zeroecho.sdk.builders.core.PlainFileBuilder; import zeroecho.sdk.content.api.DataContent; diff --git a/app/src/main/java/zeroecho/Tag.java b/app/src/main/java/zeroecho/Tag.java index b6c03ec..6171f2a 100644 --- a/app/src/main/java/zeroecho/Tag.java +++ b/app/src/main/java/zeroecho/Tag.java @@ -59,8 +59,8 @@ import zeroecho.core.spec.VoidSpec; import zeroecho.core.spi.KeyringUnlockProvider; import zeroecho.core.storage.KeyringStore; import zeroecho.core.tag.TagEngineBuilder; -import zeroecho.sdk.builders.TagTrailerDataContentBuilder; import zeroecho.sdk.ZeroEchoSession; +import zeroecho.sdk.builders.TagTrailerDataContentBuilder; import zeroecho.sdk.content.api.DataContent; import zeroecho.sdk.content.api.PlainContent; import zeroecho.sdk.content.builtin.PlainFile; diff --git a/ext/src/test/java/zeroecho/ext/integrations/covert/jpeg/JpegExifIntegrationTest.java b/ext/src/test/java/zeroecho/ext/integrations/covert/jpeg/JpegExifIntegrationTest.java index 4c002fe..d60a531 100644 --- a/ext/src/test/java/zeroecho/ext/integrations/covert/jpeg/JpegExifIntegrationTest.java +++ b/ext/src/test/java/zeroecho/ext/integrations/covert/jpeg/JpegExifIntegrationTest.java @@ -57,11 +57,11 @@ import conflux.Ctx; import conflux.CtxInterface; import zeroecho.core.alg.aes.AesKeyGenSpec; import zeroecho.core.alg.aes.AesSpec; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.alg.AesDataContentBuilder; import zeroecho.sdk.builders.core.DataContentChainBuilder; import zeroecho.sdk.builders.core.PlainBytesBuilder; import zeroecho.sdk.content.api.DataContent; -import zeroecho.sdk.ZeroEchoSession; class JpegExifIntegrationTest { diff --git a/lib/src/main/java/zeroecho/core/alg/aes/AesCipherContext.java b/lib/src/main/java/zeroecho/core/alg/aes/AesCipherContext.java index ad9fd1d..6f79e5b 100644 --- a/lib/src/main/java/zeroecho/core/alg/aes/AesCipherContext.java +++ b/lib/src/main/java/zeroecho/core/alg/aes/AesCipherContext.java @@ -33,8 +33,8 @@ ******************************************************************************/ package zeroecho.core.alg.aes; -import java.io.IOException; import java.io.FilterInputStream; +import java.io.IOException; import java.io.InputStream; import java.security.GeneralSecurityException; import java.security.SecureRandom; diff --git a/lib/src/main/java/zeroecho/core/alg/bike/BikeAlgorithm.java b/lib/src/main/java/zeroecho/core/alg/bike/BikeAlgorithm.java index 5ef65fc..e69a786 100644 --- a/lib/src/main/java/zeroecho/core/alg/bike/BikeAlgorithm.java +++ b/lib/src/main/java/zeroecho/core/alg/bike/BikeAlgorithm.java @@ -44,8 +44,8 @@ import java.security.PublicKey; import java.security.SecureRandom; import java.security.Security; import java.security.spec.PKCS8EncodedKeySpec; -import java.util.Arrays; import java.security.spec.X509EncodedKeySpec; +import java.util.Arrays; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.BIKEParameterSpec; diff --git a/lib/src/main/java/zeroecho/core/alg/cmce/CmceAlgorithm.java b/lib/src/main/java/zeroecho/core/alg/cmce/CmceAlgorithm.java index 686bb09..0eab30b 100644 --- a/lib/src/main/java/zeroecho/core/alg/cmce/CmceAlgorithm.java +++ b/lib/src/main/java/zeroecho/core/alg/cmce/CmceAlgorithm.java @@ -44,8 +44,8 @@ import java.security.PublicKey; import java.security.SecureRandom; import java.security.Security; import java.security.spec.PKCS8EncodedKeySpec; -import java.util.Arrays; import java.security.spec.X509EncodedKeySpec; +import java.util.Arrays; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.CMCEParameterSpec; diff --git a/lib/src/main/java/zeroecho/core/alg/frodo/FrodoAlgorithm.java b/lib/src/main/java/zeroecho/core/alg/frodo/FrodoAlgorithm.java index d3c7b1f..f9938b7 100644 --- a/lib/src/main/java/zeroecho/core/alg/frodo/FrodoAlgorithm.java +++ b/lib/src/main/java/zeroecho/core/alg/frodo/FrodoAlgorithm.java @@ -44,8 +44,8 @@ import java.security.PublicKey; import java.security.SecureRandom; import java.security.Security; import java.security.spec.PKCS8EncodedKeySpec; -import java.util.Arrays; import java.security.spec.X509EncodedKeySpec; +import java.util.Arrays; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.FrodoParameterSpec; diff --git a/lib/src/main/java/zeroecho/core/alg/hmac/HmacKeyImportSpec.java b/lib/src/main/java/zeroecho/core/alg/hmac/HmacKeyImportSpec.java index 98efe41..4fbef11 100644 --- a/lib/src/main/java/zeroecho/core/alg/hmac/HmacKeyImportSpec.java +++ b/lib/src/main/java/zeroecho/core/alg/hmac/HmacKeyImportSpec.java @@ -33,8 +33,8 @@ ******************************************************************************/ package zeroecho.core.alg.hmac; -import java.util.Base64; import java.util.Arrays; +import java.util.Base64; import java.util.HexFormat; import java.util.Objects; import java.util.concurrent.locks.ReentrantLock; diff --git a/lib/src/main/java/zeroecho/core/alg/hqc/HqcAlgorithm.java b/lib/src/main/java/zeroecho/core/alg/hqc/HqcAlgorithm.java index 30632ae..aff1b4d 100644 --- a/lib/src/main/java/zeroecho/core/alg/hqc/HqcAlgorithm.java +++ b/lib/src/main/java/zeroecho/core/alg/hqc/HqcAlgorithm.java @@ -44,8 +44,8 @@ import java.security.PublicKey; import java.security.SecureRandom; import java.security.Security; import java.security.spec.PKCS8EncodedKeySpec; -import java.util.Arrays; import java.security.spec.X509EncodedKeySpec; +import java.util.Arrays; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.HQCParameterSpec; diff --git a/lib/src/main/java/zeroecho/core/alg/kyber/KyberAlgorithm.java b/lib/src/main/java/zeroecho/core/alg/kyber/KyberAlgorithm.java index 084ba6e..eb9f36c 100644 --- a/lib/src/main/java/zeroecho/core/alg/kyber/KyberAlgorithm.java +++ b/lib/src/main/java/zeroecho/core/alg/kyber/KyberAlgorithm.java @@ -44,8 +44,8 @@ import java.security.PublicKey; import java.security.SecureRandom; import java.security.Security; import java.security.spec.PKCS8EncodedKeySpec; -import java.util.Arrays; import java.security.spec.X509EncodedKeySpec; +import java.util.Arrays; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.KyberParameterSpec; diff --git a/lib/src/main/java/zeroecho/core/alg/ntru/NtruAlgorithm.java b/lib/src/main/java/zeroecho/core/alg/ntru/NtruAlgorithm.java index fd3a224..8d0a9e2 100644 --- a/lib/src/main/java/zeroecho/core/alg/ntru/NtruAlgorithm.java +++ b/lib/src/main/java/zeroecho/core/alg/ntru/NtruAlgorithm.java @@ -44,8 +44,8 @@ import java.security.PublicKey; import java.security.SecureRandom; import java.security.Security; import java.security.spec.PKCS8EncodedKeySpec; -import java.util.Arrays; import java.security.spec.X509EncodedKeySpec; +import java.util.Arrays; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.NTRUParameterSpec; diff --git a/lib/src/main/java/zeroecho/core/alg/ntruprime/NtrulPrimeAlgorithm.java b/lib/src/main/java/zeroecho/core/alg/ntruprime/NtrulPrimeAlgorithm.java index e34e846..96af41b 100644 --- a/lib/src/main/java/zeroecho/core/alg/ntruprime/NtrulPrimeAlgorithm.java +++ b/lib/src/main/java/zeroecho/core/alg/ntruprime/NtrulPrimeAlgorithm.java @@ -44,8 +44,8 @@ import java.security.PublicKey; import java.security.SecureRandom; import java.security.Security; import java.security.spec.PKCS8EncodedKeySpec; -import java.util.Arrays; import java.security.spec.X509EncodedKeySpec; +import java.util.Arrays; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.NTRULPRimeParameterSpec; diff --git a/lib/src/main/java/zeroecho/core/alg/ntruprime/SntruPrimeAlgorithm.java b/lib/src/main/java/zeroecho/core/alg/ntruprime/SntruPrimeAlgorithm.java index 4c777bd..bfcddec 100644 --- a/lib/src/main/java/zeroecho/core/alg/ntruprime/SntruPrimeAlgorithm.java +++ b/lib/src/main/java/zeroecho/core/alg/ntruprime/SntruPrimeAlgorithm.java @@ -44,8 +44,8 @@ import java.security.PublicKey; import java.security.SecureRandom; import java.security.Security; import java.security.spec.PKCS8EncodedKeySpec; -import java.util.Arrays; import java.security.spec.X509EncodedKeySpec; +import java.util.Arrays; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; import org.bouncycastle.pqc.jcajce.spec.SNTRUPrimeParameterSpec; diff --git a/lib/src/main/java/zeroecho/core/alg/saber/SaberAlgorithm.java b/lib/src/main/java/zeroecho/core/alg/saber/SaberAlgorithm.java index 70643d1..103fc88 100644 --- a/lib/src/main/java/zeroecho/core/alg/saber/SaberAlgorithm.java +++ b/lib/src/main/java/zeroecho/core/alg/saber/SaberAlgorithm.java @@ -44,8 +44,8 @@ import java.security.PublicKey; import java.security.SecureRandom; import java.security.Security; import java.security.spec.PKCS8EncodedKeySpec; -import java.util.Arrays; import java.security.spec.X509EncodedKeySpec; +import java.util.Arrays; import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider; diff --git a/lib/src/main/java/zeroecho/core/storage/KeyringStore.java b/lib/src/main/java/zeroecho/core/storage/KeyringStore.java index d92baae..310fa6e 100644 --- a/lib/src/main/java/zeroecho/core/storage/KeyringStore.java +++ b/lib/src/main/java/zeroecho/core/storage/KeyringStore.java @@ -11,12 +11,12 @@ import java.io.DataOutputStream; import java.io.EOFException; import java.io.IOException; import java.nio.ByteBuffer; -import java.nio.charset.CharacterCodingException; -import java.nio.charset.CodingErrorAction; -import java.nio.charset.StandardCharsets; import java.nio.channels.FileChannel; import java.nio.channels.FileLock; import java.nio.channels.OverlappingFileLockException; +import java.nio.charset.CharacterCodingException; +import java.nio.charset.CodingErrorAction; +import java.nio.charset.StandardCharsets; import java.nio.file.AtomicMoveNotSupportedException; import java.nio.file.FileStore; import java.nio.file.Files; diff --git a/lib/src/main/java/zeroecho/core/tag/TagEngineBuilder.java b/lib/src/main/java/zeroecho/core/tag/TagEngineBuilder.java index 2aeba64..8541749 100644 --- a/lib/src/main/java/zeroecho/core/tag/TagEngineBuilder.java +++ b/lib/src/main/java/zeroecho/core/tag/TagEngineBuilder.java @@ -48,8 +48,8 @@ import zeroecho.core.alg.ecdsa.EcdsaCurveSpec; import zeroecho.core.alg.hmac.HmacSpec; import zeroecho.core.alg.rsa.RsaSigSpec; import zeroecho.core.spec.ContextSpec; -import zeroecho.sdk.ZeroEchoSession; import zeroecho.core.spec.VoidSpec; +import zeroecho.sdk.ZeroEchoSession; /** * Factory-style builder that supplies fresh {@link TagEngine} instances on diff --git a/lib/src/main/java/zeroecho/sdk/ZeroEchoSession.java b/lib/src/main/java/zeroecho/sdk/ZeroEchoSession.java index b0beb7b..f359c83 100644 --- a/lib/src/main/java/zeroecho/sdk/ZeroEchoSession.java +++ b/lib/src/main/java/zeroecho/sdk/ZeroEchoSession.java @@ -35,9 +35,9 @@ package zeroecho.sdk; import java.security.Key; import java.security.KeyPair; +import java.util.Map; import java.util.Objects; import java.util.Set; -import java.util.Map; import java.util.UUID; import java.util.concurrent.locks.ReentrantLock; @@ -48,9 +48,9 @@ import zeroecho.core.CryptoAlgorithm; import zeroecho.core.CryptoAlgorithms; import zeroecho.core.KeyUsage; import zeroecho.core.audit.AuditListener; +import zeroecho.core.audit.AuditListeners; import zeroecho.core.audit.AuditMode; import zeroecho.core.audit.AuditedContexts; -import zeroecho.core.audit.AuditListeners; import zeroecho.core.context.AgreementContext; import zeroecho.core.context.CryptoContext; import zeroecho.core.context.DigestContext; diff --git a/lib/src/main/java/zeroecho/sdk/builders/HybridKexBuilder.java b/lib/src/main/java/zeroecho/sdk/builders/HybridKexBuilder.java index 9b399ed..817fcff 100644 --- a/lib/src/main/java/zeroecho/sdk/builders/HybridKexBuilder.java +++ b/lib/src/main/java/zeroecho/sdk/builders/HybridKexBuilder.java @@ -33,8 +33,6 @@ ******************************************************************************/ package zeroecho.sdk.builders; -import zeroecho.sdk.ZeroEchoSession; - import java.io.IOException; import java.security.PrivateKey; import java.security.PublicKey; @@ -45,6 +43,7 @@ import zeroecho.core.alg.common.agreement.KeyPairKey; import zeroecho.core.context.AgreementContext; import zeroecho.core.context.MessageAgreementContext; import zeroecho.core.spec.ContextSpec; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.hybrid.kex.HybridKexContext; import zeroecho.sdk.hybrid.kex.HybridKexExporter; import zeroecho.sdk.hybrid.kex.HybridKexPolicy; diff --git a/lib/src/main/java/zeroecho/sdk/builders/SignatureTrailerDataContentBuilder.java b/lib/src/main/java/zeroecho/sdk/builders/SignatureTrailerDataContentBuilder.java index b26119b..f6c32f0 100644 --- a/lib/src/main/java/zeroecho/sdk/builders/SignatureTrailerDataContentBuilder.java +++ b/lib/src/main/java/zeroecho/sdk/builders/SignatureTrailerDataContentBuilder.java @@ -33,8 +33,6 @@ ******************************************************************************/ package zeroecho.sdk.builders; -import zeroecho.sdk.ZeroEchoSession; - import java.security.PrivateKey; import java.security.PublicKey; import java.security.Signature; @@ -46,6 +44,7 @@ import conflux.Key; import zeroecho.core.KeyUsage; import zeroecho.core.spec.ContextSpec; import zeroecho.core.tag.TagEngine; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.core.DataContentBuilder; import zeroecho.sdk.content.api.DataContent; import zeroecho.sdk.hybrid.signature.HybridSignatureContexts; diff --git a/lib/src/main/java/zeroecho/sdk/builders/alg/AesDataContentBuilder.java b/lib/src/main/java/zeroecho/sdk/builders/alg/AesDataContentBuilder.java index fd0a380..9317e33 100644 --- a/lib/src/main/java/zeroecho/sdk/builders/alg/AesDataContentBuilder.java +++ b/lib/src/main/java/zeroecho/sdk/builders/alg/AesDataContentBuilder.java @@ -33,8 +33,6 @@ ******************************************************************************/ package zeroecho.sdk.builders.alg; -import zeroecho.sdk.ZeroEchoSession; - import java.io.IOException; import java.io.InputStream; import java.security.GeneralSecurityException; @@ -55,6 +53,7 @@ import zeroecho.core.alg.aes.AesKeyImportSpec; import zeroecho.core.alg.aes.AesSpec; import zeroecho.core.context.EncryptionContext; import zeroecho.core.spi.ContextAware; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.core.DataContentBuilder; import zeroecho.sdk.content.api.DataContent; import zeroecho.sdk.content.api.EncryptedContent; diff --git a/lib/src/main/java/zeroecho/sdk/builders/alg/ChaChaDataContentBuilder.java b/lib/src/main/java/zeroecho/sdk/builders/alg/ChaChaDataContentBuilder.java index 8ec8037..c70fa84 100644 --- a/lib/src/main/java/zeroecho/sdk/builders/alg/ChaChaDataContentBuilder.java +++ b/lib/src/main/java/zeroecho/sdk/builders/alg/ChaChaDataContentBuilder.java @@ -33,8 +33,6 @@ ******************************************************************************/ package zeroecho.sdk.builders.alg; -import zeroecho.sdk.ZeroEchoSession; - import java.io.IOException; import java.io.InputStream; import java.security.GeneralSecurityException; @@ -56,6 +54,7 @@ import zeroecho.core.alg.chacha.ChaChaSpec; import zeroecho.core.context.EncryptionContext; import zeroecho.core.spec.ContextSpec; import zeroecho.core.spi.ContextAware; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.core.DataContentBuilder; import zeroecho.sdk.content.api.DataContent; import zeroecho.sdk.content.api.EncryptedContent; diff --git a/lib/src/main/java/zeroecho/sdk/builders/alg/DigestDataContentBuilder.java b/lib/src/main/java/zeroecho/sdk/builders/alg/DigestDataContentBuilder.java index ff71c41..3d30bf3 100644 --- a/lib/src/main/java/zeroecho/sdk/builders/alg/DigestDataContentBuilder.java +++ b/lib/src/main/java/zeroecho/sdk/builders/alg/DigestDataContentBuilder.java @@ -33,8 +33,6 @@ ******************************************************************************/ package zeroecho.sdk.builders.alg; -import zeroecho.sdk.ZeroEchoSession; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -50,6 +48,7 @@ import zeroecho.core.NullKey; import zeroecho.core.alg.digest.DigestSpec; import zeroecho.core.context.DigestContext; import zeroecho.core.io.TailStrippingInputStream; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.core.DataContentBuilder; import zeroecho.sdk.content.api.DataContent; import zeroecho.sdk.content.api.PlainContent; diff --git a/lib/src/main/java/zeroecho/sdk/builders/alg/ElgamalEncDataContentBuilder.java b/lib/src/main/java/zeroecho/sdk/builders/alg/ElgamalEncDataContentBuilder.java index d7571dc..f329801 100644 --- a/lib/src/main/java/zeroecho/sdk/builders/alg/ElgamalEncDataContentBuilder.java +++ b/lib/src/main/java/zeroecho/sdk/builders/alg/ElgamalEncDataContentBuilder.java @@ -33,8 +33,6 @@ ******************************************************************************/ package zeroecho.sdk.builders.alg; -import zeroecho.sdk.ZeroEchoSession; - import java.io.IOException; import java.io.InputStream; import java.security.GeneralSecurityException; @@ -50,6 +48,7 @@ import zeroecho.core.alg.elgamal.ElgamalParamSpec; import zeroecho.core.alg.elgamal.ElgamalPrivateKeySpec; import zeroecho.core.alg.elgamal.ElgamalPublicKeySpec; import zeroecho.core.context.EncryptionContext; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.core.DataContentBuilder; import zeroecho.sdk.content.api.DataContent; import zeroecho.sdk.content.api.EncryptedContent; diff --git a/lib/src/main/java/zeroecho/sdk/builders/alg/HmacDataContentBuilder.java b/lib/src/main/java/zeroecho/sdk/builders/alg/HmacDataContentBuilder.java index 6f113a3..a7413d2 100644 --- a/lib/src/main/java/zeroecho/sdk/builders/alg/HmacDataContentBuilder.java +++ b/lib/src/main/java/zeroecho/sdk/builders/alg/HmacDataContentBuilder.java @@ -33,8 +33,6 @@ ******************************************************************************/ package zeroecho.sdk.builders.alg; -import zeroecho.sdk.ZeroEchoSession; - import java.io.ByteArrayInputStream; import java.io.FilterInputStream; import java.io.IOException; @@ -52,6 +50,7 @@ import zeroecho.core.alg.hmac.HmacKeyImportSpec; import zeroecho.core.alg.hmac.HmacSpec; import zeroecho.core.context.MacContext; import zeroecho.core.io.TailStrippingInputStream; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.core.DataContentBuilder; import zeroecho.sdk.content.api.DataContent; import zeroecho.sdk.content.api.PlainContent; diff --git a/lib/src/main/java/zeroecho/sdk/builders/alg/KemDataContentBuilder.java b/lib/src/main/java/zeroecho/sdk/builders/alg/KemDataContentBuilder.java index ff2695f..e5e2e6e 100644 --- a/lib/src/main/java/zeroecho/sdk/builders/alg/KemDataContentBuilder.java +++ b/lib/src/main/java/zeroecho/sdk/builders/alg/KemDataContentBuilder.java @@ -33,8 +33,6 @@ ******************************************************************************/ package zeroecho.sdk.builders.alg; -import zeroecho.sdk.ZeroEchoSession; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -55,6 +53,7 @@ import zeroecho.core.context.KemContext; import zeroecho.core.context.KemContext.KemResult; import zeroecho.core.io.Util; import zeroecho.core.spec.VoidSpec; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.core.DataContentBuilder; import zeroecho.sdk.content.api.DataContent; import zeroecho.sdk.content.api.EncryptedContent; diff --git a/lib/src/main/java/zeroecho/sdk/builders/alg/RsaEncDataContentBuilder.java b/lib/src/main/java/zeroecho/sdk/builders/alg/RsaEncDataContentBuilder.java index 3a29f81..7434508 100644 --- a/lib/src/main/java/zeroecho/sdk/builders/alg/RsaEncDataContentBuilder.java +++ b/lib/src/main/java/zeroecho/sdk/builders/alg/RsaEncDataContentBuilder.java @@ -33,8 +33,6 @@ ******************************************************************************/ package zeroecho.sdk.builders.alg; -import zeroecho.sdk.ZeroEchoSession; - import java.io.IOException; import java.io.InputStream; import java.security.GeneralSecurityException; @@ -49,6 +47,7 @@ import zeroecho.core.alg.rsa.RsaKeyGenSpec; import zeroecho.core.alg.rsa.RsaPrivateKeySpec; import zeroecho.core.alg.rsa.RsaPublicKeySpec; import zeroecho.core.context.EncryptionContext; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.core.DataContentBuilder; import zeroecho.sdk.content.api.DataContent; import zeroecho.sdk.content.api.EncryptedContent; diff --git a/lib/src/main/java/zeroecho/sdk/builders/alg/RsaSigDataContentBuilder.java b/lib/src/main/java/zeroecho/sdk/builders/alg/RsaSigDataContentBuilder.java index 214a848..227f7f0 100644 --- a/lib/src/main/java/zeroecho/sdk/builders/alg/RsaSigDataContentBuilder.java +++ b/lib/src/main/java/zeroecho/sdk/builders/alg/RsaSigDataContentBuilder.java @@ -33,8 +33,6 @@ ******************************************************************************/ package zeroecho.sdk.builders.alg; -import zeroecho.sdk.ZeroEchoSession; - import java.io.ByteArrayInputStream; import java.io.FilterInputStream; import java.io.IOException; @@ -56,6 +54,7 @@ import zeroecho.core.alg.rsa.RsaPublicKeySpec; import zeroecho.core.alg.rsa.RsaSigSpec; import zeroecho.core.context.SignatureContext; import zeroecho.core.io.TailStrippingInputStream; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.core.DataContentBuilder; import zeroecho.sdk.content.api.DataContent; import zeroecho.sdk.content.api.PlainContent; diff --git a/lib/src/main/java/zeroecho/sdk/content/builtin/SecretPassword.java b/lib/src/main/java/zeroecho/sdk/content/builtin/SecretPassword.java index 5dacde3..7b67abe 100644 --- a/lib/src/main/java/zeroecho/sdk/content/builtin/SecretPassword.java +++ b/lib/src/main/java/zeroecho/sdk/content/builtin/SecretPassword.java @@ -45,8 +45,8 @@ import java.util.concurrent.locks.ReentrantLock; import javax.security.auth.Destroyable; -import zeroecho.sdk.content.api.SecretContent; import zeroecho.sdk.content.api.DataContent; +import zeroecho.sdk.content.api.SecretContent; import zeroecho.sdk.util.Password; /** diff --git a/lib/src/main/java/zeroecho/sdk/guard/EncCtxOpener.java b/lib/src/main/java/zeroecho/sdk/guard/EncCtxOpener.java index 98d162b..c014bab 100644 --- a/lib/src/main/java/zeroecho/sdk/guard/EncCtxOpener.java +++ b/lib/src/main/java/zeroecho/sdk/guard/EncCtxOpener.java @@ -33,8 +33,6 @@ ******************************************************************************/ package zeroecho.sdk.guard; -import zeroecho.sdk.ZeroEchoSession; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -44,6 +42,7 @@ import java.util.Objects; import zeroecho.core.KeyUsage; import zeroecho.core.context.EncryptionContext; +import zeroecho.sdk.ZeroEchoSession; /** * Reusable opener for {@code CTX-ENC:} entries. diff --git a/lib/src/main/java/zeroecho/sdk/guard/Encryptor.java b/lib/src/main/java/zeroecho/sdk/guard/Encryptor.java index 0a4c7fb..ad19aff 100644 --- a/lib/src/main/java/zeroecho/sdk/guard/Encryptor.java +++ b/lib/src/main/java/zeroecho/sdk/guard/Encryptor.java @@ -48,11 +48,11 @@ import javax.crypto.spec.SecretKeySpec; import javax.security.auth.DestroyFailedException; import zeroecho.core.io.Util; +import zeroecho.core.util.RandomSupport; import zeroecho.sdk.builders.alg.AesDataContentBuilder; import zeroecho.sdk.builders.alg.ChaChaDataContentBuilder; import zeroecho.sdk.content.api.DataContent; import zeroecho.sdk.content.api.EncryptedContent; -import zeroecho.core.util.RandomSupport; /** * Encrypting stage that emits the recipient table followed by the symmetric diff --git a/lib/src/main/java/zeroecho/sdk/guard/KemCtxOpener.java b/lib/src/main/java/zeroecho/sdk/guard/KemCtxOpener.java index 233f8bf..a90edce 100644 --- a/lib/src/main/java/zeroecho/sdk/guard/KemCtxOpener.java +++ b/lib/src/main/java/zeroecho/sdk/guard/KemCtxOpener.java @@ -33,8 +33,6 @@ ******************************************************************************/ package zeroecho.sdk.guard; -import zeroecho.sdk.ZeroEchoSession; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.security.GeneralSecurityException; @@ -46,6 +44,7 @@ import javax.crypto.AEADBadTagException; import zeroecho.core.KeyUsage; import zeroecho.core.context.KemContext; import zeroecho.core.io.Util; +import zeroecho.sdk.ZeroEchoSession; /** * Reusable opener for {@code KEM::GCM-WRAP} entries. diff --git a/lib/src/main/java/zeroecho/sdk/guard/PasswordRecipient.java b/lib/src/main/java/zeroecho/sdk/guard/PasswordRecipient.java index 95d1a20..61fee1d 100644 --- a/lib/src/main/java/zeroecho/sdk/guard/PasswordRecipient.java +++ b/lib/src/main/java/zeroecho/sdk/guard/PasswordRecipient.java @@ -43,8 +43,8 @@ import java.util.concurrent.locks.ReentrantLock; import javax.security.auth.Destroyable; import zeroecho.core.io.Util; -import zeroecho.sdk.Pbkdf2Limits; import zeroecho.core.util.RandomSupport; +import zeroecho.sdk.Pbkdf2Limits; /** * Password recipient that derives a KEK via PBKDF2(HMAC-SHA-256) and wraps the diff --git a/lib/src/main/java/zeroecho/sdk/hybrid/kex/HybridKexContexts.java b/lib/src/main/java/zeroecho/sdk/hybrid/kex/HybridKexContexts.java index d68457c..2e0ad74 100644 --- a/lib/src/main/java/zeroecho/sdk/hybrid/kex/HybridKexContexts.java +++ b/lib/src/main/java/zeroecho/sdk/hybrid/kex/HybridKexContexts.java @@ -33,8 +33,6 @@ ******************************************************************************/ package zeroecho.sdk.hybrid.kex; -import zeroecho.sdk.ZeroEchoSession; - import java.io.IOException; import java.security.PrivateKey; import java.security.PublicKey; @@ -45,6 +43,7 @@ import zeroecho.core.context.AgreementContext; import zeroecho.core.context.CryptoContext; import zeroecho.core.context.MessageAgreementContext; import zeroecho.core.spec.ContextSpec; +import zeroecho.sdk.ZeroEchoSession; /** * Factory utilities for constructing hybrid key exchange (KEX) contexts. diff --git a/lib/src/main/java/zeroecho/sdk/hybrid/signature/HybridSignatureContext.java b/lib/src/main/java/zeroecho/sdk/hybrid/signature/HybridSignatureContext.java index 58298ce..f25a5d1 100644 --- a/lib/src/main/java/zeroecho/sdk/hybrid/signature/HybridSignatureContext.java +++ b/lib/src/main/java/zeroecho/sdk/hybrid/signature/HybridSignatureContext.java @@ -33,8 +33,6 @@ ******************************************************************************/ package zeroecho.sdk.hybrid.signature; -import zeroecho.sdk.ZeroEchoSession; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -55,6 +53,7 @@ import zeroecho.core.err.VerificationException; import zeroecho.core.io.TailStrippingInputStream; import zeroecho.core.spec.ContextSpec; import zeroecho.core.tag.ThrowingBiPredicate.VerificationBiPredicate; +import zeroecho.sdk.ZeroEchoSession; /** * Package-private {@link SignatureContext} that composes two signature engines. diff --git a/lib/src/test/java/zeroecho/core/CapabilityValueSemanticsTest.java b/lib/src/test/java/zeroecho/core/CapabilityValueSemanticsTest.java index 05bedfb..e5fc63f 100644 --- a/lib/src/test/java/zeroecho/core/CapabilityValueSemanticsTest.java +++ b/lib/src/test/java/zeroecho/core/CapabilityValueSemanticsTest.java @@ -11,14 +11,14 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; import java.io.IOException; -import java.util.concurrent.atomic.AtomicInteger; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.Test; -import zeroecho.core.context.DigestContext; import zeroecho.core.alg.AbstractCryptoAlgorithm; +import zeroecho.core.context.DigestContext; import zeroecho.core.spec.ContextSpec; /** diff --git a/lib/src/test/java/zeroecho/core/CatalogContractTest.java b/lib/src/test/java/zeroecho/core/CatalogContractTest.java index 4bddaa0..38ceb5b 100644 --- a/lib/src/test/java/zeroecho/core/CatalogContractTest.java +++ b/lib/src/test/java/zeroecho/core/CatalogContractTest.java @@ -63,6 +63,7 @@ import javax.xml.transform.stream.StreamSource; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import zeroecho.core.audit.AuditMode; import zeroecho.core.audit.JulAuditListenerStd; import zeroecho.core.context.DigestContext; import zeroecho.core.context.EncryptionContext; @@ -71,11 +72,8 @@ import zeroecho.core.context.MacContext; import zeroecho.core.context.SignatureContext; import zeroecho.core.io.TailStrippingInputStream; import zeroecho.core.spec.AlgorithmKeySpec; -import zeroecho.core.KeyOperation; -import zeroecho.core.KeyOperationInfo; import zeroecho.core.spi.AsymmetricKeyPairGenerator; import zeroecho.core.spi.SymmetricKeyGenerator; -import zeroecho.core.audit.AuditMode; import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.util.BouncyCastleActivator; diff --git a/lib/src/test/java/zeroecho/core/CryptoAlgorithmsAuditWrapTest.java b/lib/src/test/java/zeroecho/core/CryptoAlgorithmsAuditWrapTest.java index 3c75c4a..04f515c 100644 --- a/lib/src/test/java/zeroecho/core/CryptoAlgorithmsAuditWrapTest.java +++ b/lib/src/test/java/zeroecho/core/CryptoAlgorithmsAuditWrapTest.java @@ -48,7 +48,6 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Proxy; -import java.security.Key; import java.security.PublicKey; import java.util.ArrayList; import java.util.List; @@ -67,7 +66,6 @@ import zeroecho.core.context.KemContext.KemResult; import zeroecho.core.context.MacContext; import zeroecho.core.context.MessageAgreementContext; import zeroecho.core.context.SignatureContext; -import zeroecho.core.spec.ContextSpec; import zeroecho.core.tag.TagEngine; /** diff --git a/lib/src/test/java/zeroecho/core/CryptoArchitectureTest.java b/lib/src/test/java/zeroecho/core/CryptoArchitectureTest.java index bf11418..fb01a12 100644 --- a/lib/src/test/java/zeroecho/core/CryptoArchitectureTest.java +++ b/lib/src/test/java/zeroecho/core/CryptoArchitectureTest.java @@ -11,7 +11,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.reflect.Proxy; -import java.security.Key; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -22,11 +21,9 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.Test; -import zeroecho.core.audit.AuditMode; import zeroecho.core.audit.AuditListener; +import zeroecho.core.audit.AuditMode; import zeroecho.core.context.DigestContext; -import zeroecho.core.policy.CryptoPolicy; -import zeroecho.core.spec.ContextSpec; import zeroecho.sdk.ZeroEchoSession; /** diff --git a/lib/src/test/java/zeroecho/core/SecretSpecLifecycleTest.java b/lib/src/test/java/zeroecho/core/SecretSpecLifecycleTest.java index 86b464d..40793ae 100644 --- a/lib/src/test/java/zeroecho/core/SecretSpecLifecycleTest.java +++ b/lib/src/test/java/zeroecho/core/SecretSpecLifecycleTest.java @@ -26,13 +26,13 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import javax.security.auth.Destroyable; import javax.crypto.SecretKey; +import javax.security.auth.Destroyable; import org.junit.jupiter.api.Test; -import zeroecho.core.alg.aes.AesKeyImportSpec; import zeroecho.core.alg.aes.AesAlgorithm; +import zeroecho.core.alg.aes.AesKeyImportSpec; import zeroecho.core.alg.chacha.ChaChaKeyImportSpec; import zeroecho.core.alg.hmac.HmacKeyImportSpec; import zeroecho.core.alg.mldsa.MldsaPrivateKeySpec; diff --git a/lib/src/test/java/zeroecho/core/WrongKeySecurityTest.java b/lib/src/test/java/zeroecho/core/WrongKeySecurityTest.java index 70968f0..df72f3f 100644 --- a/lib/src/test/java/zeroecho/core/WrongKeySecurityTest.java +++ b/lib/src/test/java/zeroecho/core/WrongKeySecurityTest.java @@ -9,15 +9,13 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.security.Key; import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.Test; -import zeroecho.core.audit.AuditMode; import zeroecho.core.audit.AuditListener; +import zeroecho.core.audit.AuditMode; import zeroecho.core.err.UnsupportedSpecException; -import zeroecho.core.spec.ContextSpec; import zeroecho.sdk.ZeroEchoSession; class WrongKeySecurityTest { diff --git a/lib/src/test/java/zeroecho/core/ZeroEchoSessionWrapIntegrationTest.java b/lib/src/test/java/zeroecho/core/ZeroEchoSessionWrapIntegrationTest.java index 070f8dc..2141620 100644 --- a/lib/src/test/java/zeroecho/core/ZeroEchoSessionWrapIntegrationTest.java +++ b/lib/src/test/java/zeroecho/core/ZeroEchoSessionWrapIntegrationTest.java @@ -26,7 +26,6 @@ import org.junit.jupiter.api.Test; import conflux.Ctx; import conflux.CtxInterface; -import zeroecho.core.audit.AuditMode; import zeroecho.core.alg.aes.AesSpec; import zeroecho.core.alg.common.agreement.KeyPairKey; import zeroecho.core.alg.ed25519.Ed25519KeyGenSpec; @@ -34,6 +33,7 @@ import zeroecho.core.alg.hmac.HmacSpec; import zeroecho.core.alg.kyber.KyberKeyGenSpec; import zeroecho.core.alg.xdh.XdhSpec; import zeroecho.core.audit.AuditListener; +import zeroecho.core.audit.AuditMode; import zeroecho.core.context.AgreementContext; import zeroecho.core.context.CryptoContext; import zeroecho.core.context.DigestContext; diff --git a/lib/src/test/java/zeroecho/core/alg/aes/AesDecryptionSecurityTest.java b/lib/src/test/java/zeroecho/core/alg/aes/AesDecryptionSecurityTest.java index bb6d029..07c5c35 100644 --- a/lib/src/test/java/zeroecho/core/alg/aes/AesDecryptionSecurityTest.java +++ b/lib/src/test/java/zeroecho/core/alg/aes/AesDecryptionSecurityTest.java @@ -26,7 +26,6 @@ import org.junit.jupiter.api.Test; import conflux.Ctx; import conflux.CtxInterface; import zeroecho.core.ConfluxKeys; -import zeroecho.core.CryptoAlgorithms; import zeroecho.core.KeyUsage; import zeroecho.core.context.EncryptionContext; import zeroecho.core.spi.ContextAware; diff --git a/lib/src/test/java/zeroecho/core/alg/aes/AesRandomSupportTest.java b/lib/src/test/java/zeroecho/core/alg/aes/AesRandomSupportTest.java index 7d0bff8..7af8495 100644 --- a/lib/src/test/java/zeroecho/core/alg/aes/AesRandomSupportTest.java +++ b/lib/src/test/java/zeroecho/core/alg/aes/AesRandomSupportTest.java @@ -7,8 +7,8 @@ package zeroecho.core.alg.aes; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -41,8 +41,8 @@ import zeroecho.core.KeyUsage; import zeroecho.core.context.EncryptionContext; import zeroecho.core.spec.VoidSpec; import zeroecho.core.spi.ContextAware; -import zeroecho.sdk.builders.alg.AesDataContentBuilder; import zeroecho.core.util.RandomSupport; +import zeroecho.sdk.builders.alg.AesDataContentBuilder; class AesRandomSupportTest { private static final SecretKey KEY = new SecretKeySpec(new byte[16], "AES"); diff --git a/lib/src/test/java/zeroecho/core/alg/common/agreement/AgreementAlgorithmsRoundTripTest.java b/lib/src/test/java/zeroecho/core/alg/common/agreement/AgreementAlgorithmsRoundTripTest.java index cfc7e33..d8a516c 100644 --- a/lib/src/test/java/zeroecho/core/alg/common/agreement/AgreementAlgorithmsRoundTripTest.java +++ b/lib/src/test/java/zeroecho/core/alg/common/agreement/AgreementAlgorithmsRoundTripTest.java @@ -56,14 +56,14 @@ import org.junit.jupiter.api.Test; import zeroecho.core.Capability; import zeroecho.core.CryptoAlgorithm; import zeroecho.core.CryptoAlgorithms; +import zeroecho.core.KeyOperation; +import zeroecho.core.KeyOperationInfo; import zeroecho.core.KeyUsage; import zeroecho.core.context.AgreementContext; import zeroecho.core.context.MessageAgreementContext; import zeroecho.core.spec.AlgorithmKeySpec; import zeroecho.core.spec.ContextSpec; import zeroecho.core.spec.VoidSpec; -import zeroecho.core.KeyOperation; -import zeroecho.core.KeyOperationInfo; import zeroecho.core.spi.AsymmetricKeyPairGenerator; import zeroecho.sdk.util.BouncyCastleActivator; diff --git a/lib/src/test/java/zeroecho/core/alg/elgamal/ElgamalLargeDataTest.java b/lib/src/test/java/zeroecho/core/alg/elgamal/ElgamalLargeDataTest.java index 24b88b4..a56a9d4 100644 --- a/lib/src/test/java/zeroecho/core/alg/elgamal/ElgamalLargeDataTest.java +++ b/lib/src/test/java/zeroecho/core/alg/elgamal/ElgamalLargeDataTest.java @@ -47,7 +47,6 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import zeroecho.core.CryptoAlgorithms; import zeroecho.core.KeyUsage; import zeroecho.core.context.EncryptionContext; diff --git a/lib/src/test/java/zeroecho/core/alg/rsa/BlockGeometryTest.java b/lib/src/test/java/zeroecho/core/alg/rsa/BlockGeometryTest.java index e7d90a9..f14344a 100644 --- a/lib/src/test/java/zeroecho/core/alg/rsa/BlockGeometryTest.java +++ b/lib/src/test/java/zeroecho/core/alg/rsa/BlockGeometryTest.java @@ -14,7 +14,6 @@ import java.security.KeyPair; import org.junit.jupiter.api.Test; -import zeroecho.core.CryptoAlgorithms; import zeroecho.core.KeyUsage; import zeroecho.core.context.EncryptionContext; diff --git a/lib/src/test/java/zeroecho/core/alg/rsa/RsaLargeDataTest.java b/lib/src/test/java/zeroecho/core/alg/rsa/RsaLargeDataTest.java index fa5da78..db7cbe0 100644 --- a/lib/src/test/java/zeroecho/core/alg/rsa/RsaLargeDataTest.java +++ b/lib/src/test/java/zeroecho/core/alg/rsa/RsaLargeDataTest.java @@ -44,7 +44,6 @@ import java.util.Arrays; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import zeroecho.core.CryptoAlgorithms; import zeroecho.core.KeyUsage; import zeroecho.core.context.EncryptionContext; diff --git a/lib/src/test/java/zeroecho/core/audit/AuditedContextsAccessorTest.java b/lib/src/test/java/zeroecho/core/audit/AuditedContextsAccessorTest.java index 7a24d9c..12ca7d5 100644 --- a/lib/src/test/java/zeroecho/core/audit/AuditedContextsAccessorTest.java +++ b/lib/src/test/java/zeroecho/core/audit/AuditedContextsAccessorTest.java @@ -26,7 +26,6 @@ import zeroecho.core.CryptoAlgorithm; import zeroecho.core.KeyUsage; import zeroecho.core.NullKey; import zeroecho.core.alg.aes.AesAlgorithm; -import zeroecho.core.context.CryptoContext; import zeroecho.core.context.DigestContext; import zeroecho.core.context.EncryptionContext; import zeroecho.core.spec.ContextSpec; diff --git a/lib/src/test/java/zeroecho/core/audit/AuditedContextsRegressionTest.java b/lib/src/test/java/zeroecho/core/audit/AuditedContextsRegressionTest.java index 849d733..91fd682 100644 --- a/lib/src/test/java/zeroecho/core/audit/AuditedContextsRegressionTest.java +++ b/lib/src/test/java/zeroecho/core/audit/AuditedContextsRegressionTest.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Proxy; -import java.security.Key; import java.security.PrivateKey; import java.security.PublicKey; import java.util.ArrayList; @@ -37,11 +36,9 @@ import org.junit.jupiter.api.Test; import zeroecho.core.KeyUsage; import zeroecho.core.context.AgreementContext; -import zeroecho.core.context.CryptoContext; import zeroecho.core.context.DigestContext; import zeroecho.core.context.EncryptionContext; import zeroecho.core.context.MessageAgreementContext; -import zeroecho.core.spec.ContextSpec; class AuditedContextsRegressionTest { diff --git a/lib/src/test/java/zeroecho/core/marshal/PairSeqTest.java b/lib/src/test/java/zeroecho/core/marshal/PairSeqTest.java index 8604fd4..ccd5ef4 100644 --- a/lib/src/test/java/zeroecho/core/marshal/PairSeqTest.java +++ b/lib/src/test/java/zeroecho/core/marshal/PairSeqTest.java @@ -11,7 +11,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.IOException; import java.io.StringReader; -import java.io.UncheckedIOException; import org.junit.jupiter.api.Test; diff --git a/lib/src/test/java/zeroecho/core/storage/KeyringCryptographicFormatTest.java b/lib/src/test/java/zeroecho/core/storage/KeyringCryptographicFormatTest.java index 49bf04b..c2c786c 100644 --- a/lib/src/test/java/zeroecho/core/storage/KeyringCryptographicFormatTest.java +++ b/lib/src/test/java/zeroecho/core/storage/KeyringCryptographicFormatTest.java @@ -1,6 +1,5 @@ package zeroecho.core.storage; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/lib/src/test/java/zeroecho/core/storage/KeyringImportRegistryTest.java b/lib/src/test/java/zeroecho/core/storage/KeyringImportRegistryTest.java index 72a1d4f..4a477e2 100644 --- a/lib/src/test/java/zeroecho/core/storage/KeyringImportRegistryTest.java +++ b/lib/src/test/java/zeroecho/core/storage/KeyringImportRegistryTest.java @@ -5,14 +5,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import java.nio.file.Path; import java.security.Key; import java.security.KeyPair; import java.security.PublicKey; -import java.nio.file.Path; import java.util.Arrays; import java.util.List; -import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; import javax.security.auth.Destroyable; diff --git a/lib/src/test/java/zeroecho/sdk/ZeroEchoSessionDestroyKeyTest.java b/lib/src/test/java/zeroecho/sdk/ZeroEchoSessionDestroyKeyTest.java index 2b01687..c85a3da 100644 --- a/lib/src/test/java/zeroecho/sdk/ZeroEchoSessionDestroyKeyTest.java +++ b/lib/src/test/java/zeroecho/sdk/ZeroEchoSessionDestroyKeyTest.java @@ -10,11 +10,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import java.security.Key; -import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicInteger; import javax.security.auth.DestroyFailedException; import javax.security.auth.Destroyable; diff --git a/lib/src/test/java/zeroecho/sdk/builders/HybridKexBuilderTest.java b/lib/src/test/java/zeroecho/sdk/builders/HybridKexBuilderTest.java index 4823972..8cb8f94 100644 --- a/lib/src/test/java/zeroecho/sdk/builders/HybridKexBuilderTest.java +++ b/lib/src/test/java/zeroecho/sdk/builders/HybridKexBuilderTest.java @@ -48,12 +48,11 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import zeroecho.core.CryptoAlgorithms; -import zeroecho.core.audit.AuditListener; -import zeroecho.core.audit.AuditMode; import zeroecho.core.alg.common.agreement.KeyPairKey; import zeroecho.core.alg.kyber.KyberKeyGenSpec; import zeroecho.core.alg.xdh.XdhSpec; +import zeroecho.core.audit.AuditListener; +import zeroecho.core.audit.AuditMode; import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.hybrid.kex.HybridKexContext; import zeroecho.sdk.hybrid.kex.HybridKexContexts; diff --git a/lib/src/test/java/zeroecho/sdk/builders/TagTrailerDataContentBuilderTest.java b/lib/src/test/java/zeroecho/sdk/builders/TagTrailerDataContentBuilderTest.java index 2202908..9b8c296 100644 --- a/lib/src/test/java/zeroecho/sdk/builders/TagTrailerDataContentBuilderTest.java +++ b/lib/src/test/java/zeroecho/sdk/builders/TagTrailerDataContentBuilderTest.java @@ -51,6 +51,8 @@ import org.junit.jupiter.api.Test; import zeroecho.core.CryptoAlgorithm; import zeroecho.core.CryptoAlgorithms; +import zeroecho.core.KeyOperation; +import zeroecho.core.KeyOperationInfo; import zeroecho.core.KeyUsage; import zeroecho.core.alg.aes.AesKeyGenSpec; import zeroecho.core.alg.digest.DigestSpec; @@ -63,8 +65,6 @@ import zeroecho.core.alg.sphincsplus.SphincsPlusKeyGenSpec; import zeroecho.core.context.EncryptionContext; import zeroecho.core.context.KemContext; import zeroecho.core.spec.AlgorithmKeySpec; -import zeroecho.core.KeyOperation; -import zeroecho.core.KeyOperationInfo; import zeroecho.core.spi.AsymmetricKeyPairGenerator; import zeroecho.core.spi.SymmetricKeyGenerator; import zeroecho.core.tag.TagEngine; diff --git a/lib/src/test/java/zeroecho/sdk/builders/alg/KemHybridRoundTripTest.java b/lib/src/test/java/zeroecho/sdk/builders/alg/KemHybridRoundTripTest.java index 3f7e49f..f1c8bd8 100644 --- a/lib/src/test/java/zeroecho/sdk/builders/alg/KemHybridRoundTripTest.java +++ b/lib/src/test/java/zeroecho/sdk/builders/alg/KemHybridRoundTripTest.java @@ -56,7 +56,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import zeroecho.core.CryptoAlgorithms; import zeroecho.core.alg.bike.BikeKeyGenSpec; import zeroecho.core.alg.cmce.CmceKeyGenSpec; import zeroecho.core.alg.frodo.FrodoKeyGenSpec; diff --git a/lib/src/test/java/zeroecho/sdk/guard/KemRecipientLifecycleTest.java b/lib/src/test/java/zeroecho/sdk/guard/KemRecipientLifecycleTest.java index bd3ed76..8bdc5df 100644 --- a/lib/src/test/java/zeroecho/sdk/guard/KemRecipientLifecycleTest.java +++ b/lib/src/test/java/zeroecho/sdk/guard/KemRecipientLifecycleTest.java @@ -10,8 +10,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.lang.reflect.Field; import java.io.IOException; +import java.lang.reflect.Field; import java.security.Key; import java.util.List; diff --git a/lib/src/test/java/zeroecho/sdk/guard/MultiRecipientEnvelopeTest.java b/lib/src/test/java/zeroecho/sdk/guard/MultiRecipientEnvelopeTest.java index 74660e3..89700e0 100644 --- a/lib/src/test/java/zeroecho/sdk/guard/MultiRecipientEnvelopeTest.java +++ b/lib/src/test/java/zeroecho/sdk/guard/MultiRecipientEnvelopeTest.java @@ -55,7 +55,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import zeroecho.core.CryptoAlgorithms; import zeroecho.core.KeyUsage; import zeroecho.core.alg.ed25519.Ed25519KeyGenSpec; import zeroecho.core.alg.elgamal.ElgamalParamSpec; diff --git a/lib/src/test/java/zeroecho/sdk/hybrid/kex/HybridKexFrameCodecTest.java b/lib/src/test/java/zeroecho/sdk/hybrid/kex/HybridKexFrameCodecTest.java index 7260380..4acb18a 100644 --- a/lib/src/test/java/zeroecho/sdk/hybrid/kex/HybridKexFrameCodecTest.java +++ b/lib/src/test/java/zeroecho/sdk/hybrid/kex/HybridKexFrameCodecTest.java @@ -6,9 +6,9 @@ package zeroecho.sdk.hybrid.kex; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoInteractions; diff --git a/lib/src/test/java/zeroecho/sdk/hybrid/kex/HybridKexTest.java b/lib/src/test/java/zeroecho/sdk/hybrid/kex/HybridKexTest.java index 774e16c..194e844 100644 --- a/lib/src/test/java/zeroecho/sdk/hybrid/kex/HybridKexTest.java +++ b/lib/src/test/java/zeroecho/sdk/hybrid/kex/HybridKexTest.java @@ -44,7 +44,6 @@ import java.util.Arrays; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import zeroecho.core.CryptoAlgorithms; import zeroecho.core.alg.common.agreement.KeyPairKey; import zeroecho.core.alg.kyber.KyberKeyGenSpec; import zeroecho.core.alg.xdh.XdhSpec; diff --git a/lib/src/test/java/zeroecho/sdk/hybrid/signature/HybridSignatureTest.java b/lib/src/test/java/zeroecho/sdk/hybrid/signature/HybridSignatureTest.java index 9817fbc..0851d08 100644 --- a/lib/src/test/java/zeroecho/sdk/hybrid/signature/HybridSignatureTest.java +++ b/lib/src/test/java/zeroecho/sdk/hybrid/signature/HybridSignatureTest.java @@ -59,8 +59,8 @@ import zeroecho.core.alg.sphincsplus.SphincsPlusKeyGenSpec; import zeroecho.core.context.SignatureContext; import zeroecho.core.io.TailStrippingInputStream; import zeroecho.core.spec.ContextSpec; -import zeroecho.sdk.builders.TagTrailerDataContentBuilder; import zeroecho.sdk.ZeroEchoSession; +import zeroecho.sdk.builders.TagTrailerDataContentBuilder; import zeroecho.sdk.builders.core.DataContentBuilder; import zeroecho.sdk.builders.core.DataContentChainBuilder; import zeroecho.sdk.content.api.DataContent; diff --git a/pki/src/main/java/zeroecho/pki/api/request/ParsedCertificationRequest.java b/pki/src/main/java/zeroecho/pki/api/request/ParsedCertificationRequest.java index d6e7af5..daa30c3 100644 --- a/pki/src/main/java/zeroecho/pki/api/request/ParsedCertificationRequest.java +++ b/pki/src/main/java/zeroecho/pki/api/request/ParsedCertificationRequest.java @@ -33,8 +33,8 @@ ******************************************************************************/ package zeroecho.pki.api.request; -import java.util.Optional; import java.util.List; +import java.util.Optional; import zeroecho.pki.api.EncodedObject; import zeroecho.pki.api.FormatId; diff --git a/pki/src/main/java/zeroecho/pki/api/request/SubjectAlternativeName.java b/pki/src/main/java/zeroecho/pki/api/request/SubjectAlternativeName.java index dbadfad..2df2ca0 100644 --- a/pki/src/main/java/zeroecho/pki/api/request/SubjectAlternativeName.java +++ b/pki/src/main/java/zeroecho/pki/api/request/SubjectAlternativeName.java @@ -4,6 +4,10 @@ ******************************************************************************/ package zeroecho.pki.api.request; +import static zeroecho.pki.api.request.SubjectAlternativeName.canonicalDns; +import static zeroecho.pki.api.request.SubjectAlternativeName.canonicalMailbox; +import static zeroecho.pki.api.request.SubjectAlternativeName.canonicalUri; + import java.net.URI; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; diff --git a/pki/src/main/java/zeroecho/pki/api/revocation/RevocationJournal.java b/pki/src/main/java/zeroecho/pki/api/revocation/RevocationJournal.java index f157644..536a88c 100644 --- a/pki/src/main/java/zeroecho/pki/api/revocation/RevocationJournal.java +++ b/pki/src/main/java/zeroecho/pki/api/revocation/RevocationJournal.java @@ -4,13 +4,13 @@ ******************************************************************************/ package zeroecho.pki.api.revocation; +import java.time.Instant; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.time.Instant; import zeroecho.pki.api.PkiId; import zeroecho.pki.api.attr.AttributeId; diff --git a/pki/src/main/java/zeroecho/pki/impl/core/CertificateProfileValidator.java b/pki/src/main/java/zeroecho/pki/impl/core/CertificateProfileValidator.java index 154928d..460d048 100644 --- a/pki/src/main/java/zeroecho/pki/impl/core/CertificateProfileValidator.java +++ b/pki/src/main/java/zeroecho/pki/impl/core/CertificateProfileValidator.java @@ -8,6 +8,7 @@ import java.security.GeneralSecurityException; import java.security.KeyFactory; import java.security.MessageDigest; import java.security.PublicKey; +import java.security.spec.X509EncodedKeySpec; import java.time.DateTimeException; import java.time.Duration; import java.time.Instant; @@ -19,14 +20,12 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import java.security.spec.X509EncodedKeySpec; - import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.DERNull; import org.bouncycastle.asn1.edec.EdECObjectIdentifiers; import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.x9.X9ObjectIdentifiers; import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; +import org.bouncycastle.asn1.x9.X9ObjectIdentifiers; import zeroecho.pki.api.Encoding; import zeroecho.pki.api.PkiException; diff --git a/pki/src/main/java/zeroecho/pki/impl/core/DefaultCaService.java b/pki/src/main/java/zeroecho/pki/impl/core/DefaultCaService.java index d06c1c5..23cf5f9 100644 --- a/pki/src/main/java/zeroecho/pki/impl/core/DefaultCaService.java +++ b/pki/src/main/java/zeroecho/pki/impl/core/DefaultCaService.java @@ -82,8 +82,8 @@ import zeroecho.pki.api.ca.CaRolloverCommand; import zeroecho.pki.api.ca.CaState; import zeroecho.pki.api.ca.IntermediateCertIssueCommand; import zeroecho.pki.api.ca.IntermediateCreateCommand; -import zeroecho.pki.api.credential.Credential; import zeroecho.pki.api.credential.CaProfileBinding; +import zeroecho.pki.api.credential.Credential; import zeroecho.pki.api.credential.CredentialStatus; import zeroecho.pki.api.credential.CredentialUse; import zeroecho.pki.api.credential.EffectiveCredentialStatus; diff --git a/pki/src/main/java/zeroecho/pki/impl/core/DefaultIssuanceService.java b/pki/src/main/java/zeroecho/pki/impl/core/DefaultIssuanceService.java index 500084d..9e8cf8b 100644 --- a/pki/src/main/java/zeroecho/pki/impl/core/DefaultIssuanceService.java +++ b/pki/src/main/java/zeroecho/pki/impl/core/DefaultIssuanceService.java @@ -51,8 +51,8 @@ import zeroecho.pki.api.Encoding; import zeroecho.pki.api.FormatId; import zeroecho.pki.api.IssuanceService; import zeroecho.pki.api.PkiException; -import zeroecho.pki.api.ProfileService; import zeroecho.pki.api.PkiId; +import zeroecho.pki.api.ProfileService; import zeroecho.pki.api.attr.AttributeValue; import zeroecho.pki.api.audit.AuditEvent; import zeroecho.pki.api.audit.Principal; @@ -71,8 +71,8 @@ import zeroecho.pki.api.issuance.ReissueCommand; import zeroecho.pki.api.issuance.RenewCommand; import zeroecho.pki.api.issuance.ReplaceCommand; import zeroecho.pki.api.issuance.VerificationPolicy; -import zeroecho.pki.api.profile.CertificateProfile; import zeroecho.pki.api.profile.ActiveCertificateProfile; +import zeroecho.pki.api.profile.CertificateProfile; import zeroecho.pki.api.request.CertificationRequest; import zeroecho.pki.api.request.ParsedCertificationRequest; import zeroecho.pki.api.request.ProofOfPossessionResult; diff --git a/pki/src/main/java/zeroecho/pki/impl/core/DefaultStatusObjectService.java b/pki/src/main/java/zeroecho/pki/impl/core/DefaultStatusObjectService.java index 8a02dfa..9a96b89 100644 --- a/pki/src/main/java/zeroecho/pki/impl/core/DefaultStatusObjectService.java +++ b/pki/src/main/java/zeroecho/pki/impl/core/DefaultStatusObjectService.java @@ -67,8 +67,8 @@ import zeroecho.pki.impl.core.attr.SimpleAttributeSet; import zeroecho.pki.impl.framework.x509.bc.BcX509Attributes; import zeroecho.pki.impl.framework.x509.bc.BcX509CredentialFramework; import zeroecho.pki.spi.audit.AuditSink; -import zeroecho.pki.spi.framework.CrlEntry; import zeroecho.pki.spi.framework.CredentialFramework; +import zeroecho.pki.spi.framework.CrlEntry; import zeroecho.pki.spi.store.PkiStore; /** diff --git a/pki/src/main/java/zeroecho/pki/impl/core/ValidatedCertificateRequest.java b/pki/src/main/java/zeroecho/pki/impl/core/ValidatedCertificateRequest.java index 10bcca0..c633203 100644 --- a/pki/src/main/java/zeroecho/pki/impl/core/ValidatedCertificateRequest.java +++ b/pki/src/main/java/zeroecho/pki/impl/core/ValidatedCertificateRequest.java @@ -12,8 +12,8 @@ import zeroecho.pki.api.EncodedObject; import zeroecho.pki.api.PkiId; import zeroecho.pki.api.SubjectRef; import zeroecho.pki.api.Validity; -import zeroecho.pki.api.profile.ExtendedKeyUsageId; import zeroecho.pki.api.profile.CertificateProfileRef; +import zeroecho.pki.api.profile.ExtendedKeyUsageId; import zeroecho.pki.api.profile.LeafKeyUsage; import zeroecho.pki.api.request.SubjectAlternativeName; import zeroecho.pki.api.request.SubjectRdn; diff --git a/pki/src/main/java/zeroecho/pki/impl/core/VerifiedIssuanceCandidate.java b/pki/src/main/java/zeroecho/pki/impl/core/VerifiedIssuanceCandidate.java index 7af519f..3712a06 100644 --- a/pki/src/main/java/zeroecho/pki/impl/core/VerifiedIssuanceCandidate.java +++ b/pki/src/main/java/zeroecho/pki/impl/core/VerifiedIssuanceCandidate.java @@ -33,18 +33,18 @@ ******************************************************************************/ package zeroecho.pki.impl.core; -import java.util.Objects; -import java.util.Optional; import java.util.ArrayList; import java.util.List; +import java.util.Objects; +import java.util.Optional; import zeroecho.pki.api.EncodedObject; import zeroecho.pki.api.PkiId; import zeroecho.pki.api.Validity; -import zeroecho.pki.api.issuance.IssueEndEntityCommand; -import zeroecho.pki.api.attr.AttributeSet; import zeroecho.pki.api.attr.AttributeId; +import zeroecho.pki.api.attr.AttributeSet; import zeroecho.pki.api.attr.AttributeValue; +import zeroecho.pki.api.issuance.IssueEndEntityCommand; import zeroecho.pki.api.request.ParsedCertificationRequest; import zeroecho.pki.api.request.ProofOfPossessionStatus; import zeroecho.pki.impl.core.attr.SimpleAttributeSet; diff --git a/pki/src/main/java/zeroecho/pki/impl/crypto/zeroecholib/ZeroEchoLibSignatureWorkflow.java b/pki/src/main/java/zeroecho/pki/impl/crypto/zeroecholib/ZeroEchoLibSignatureWorkflow.java index 8a8e204..7768f56 100644 --- a/pki/src/main/java/zeroecho/pki/impl/crypto/zeroecholib/ZeroEchoLibSignatureWorkflow.java +++ b/pki/src/main/java/zeroecho/pki/impl/crypto/zeroecholib/ZeroEchoLibSignatureWorkflow.java @@ -43,10 +43,10 @@ import java.io.OutputStream; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.channels.FileLock; +import java.nio.charset.StandardCharsets; import java.nio.file.AtomicMoveNotSupportedException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.charset.StandardCharsets; import java.nio.file.StandardCopyOption; import java.nio.file.StandardOpenOption; import java.nio.file.attribute.PosixFilePermissions; @@ -68,10 +68,10 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; +import java.util.concurrent.locks.ReentrantLock; import java.util.function.BiConsumer; import java.util.logging.Level; import java.util.logging.Logger; @@ -90,16 +90,16 @@ import zeroecho.core.context.SignatureContext; import zeroecho.core.io.TailStrippingInputStream; import zeroecho.core.spec.AlgorithmKeySpec; import zeroecho.core.spec.ContextSpec; -import zeroecho.core.storage.KeyringStore; -import zeroecho.core.storage.KeyringPassword; import zeroecho.core.spi.KeyringUnlockProvider; -import zeroecho.sdk.ZeroEchoSession; +import zeroecho.core.storage.KeyringPassword; +import zeroecho.core.storage.KeyringStore; import zeroecho.pki.api.EncodedObject; import zeroecho.pki.api.Encoding; import zeroecho.pki.api.KeyRef; import zeroecho.pki.api.PkiId; import zeroecho.pki.api.orch.SigningSubmissionId; import zeroecho.pki.spi.crypto.SignatureWorkflow; +import zeroecho.sdk.ZeroEchoSession; /** * ZeroEcho-lib backed implementation of {@link SignatureWorkflow}. diff --git a/pki/src/main/java/zeroecho/pki/impl/framework/x509/bc/BcX509CertificationRequestParser.java b/pki/src/main/java/zeroecho/pki/impl/framework/x509/bc/BcX509CertificationRequestParser.java index cd79f9d..41a8512 100644 --- a/pki/src/main/java/zeroecho/pki/impl/framework/x509/bc/BcX509CertificationRequestParser.java +++ b/pki/src/main/java/zeroecho/pki/impl/framework/x509/bc/BcX509CertificationRequestParser.java @@ -37,9 +37,9 @@ import java.io.ByteArrayInputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; -import java.util.HexFormat; import java.util.ArrayList; import java.util.HashSet; +import java.util.HexFormat; import java.util.List; import java.util.Objects; import java.util.Optional; diff --git a/pki/src/main/java/zeroecho/pki/impl/framework/x509/bc/BcX509CredentialIssuerBackend.java b/pki/src/main/java/zeroecho/pki/impl/framework/x509/bc/BcX509CredentialIssuerBackend.java index 4cdfe6a..110a275 100644 --- a/pki/src/main/java/zeroecho/pki/impl/framework/x509/bc/BcX509CredentialIssuerBackend.java +++ b/pki/src/main/java/zeroecho/pki/impl/framework/x509/bc/BcX509CredentialIssuerBackend.java @@ -43,8 +43,8 @@ import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x509.BasicConstraints; -import org.bouncycastle.asn1.x509.Extension; import org.bouncycastle.asn1.x509.ExtendedKeyUsage; +import org.bouncycastle.asn1.x509.Extension; import org.bouncycastle.asn1.x509.GeneralName; import org.bouncycastle.asn1.x509.GeneralNames; import org.bouncycastle.asn1.x509.KeyPurposeId; @@ -62,11 +62,11 @@ import zeroecho.pki.api.PkiException; import zeroecho.pki.api.PkiId; import zeroecho.pki.api.SubjectRef; import zeroecho.pki.api.Validity; -import zeroecho.pki.api.credential.Credential; import zeroecho.pki.api.credential.CaProfileBinding; -import zeroecho.pki.api.credential.EndEntityProfileBinding; +import zeroecho.pki.api.credential.Credential; import zeroecho.pki.api.credential.CredentialBundle; import zeroecho.pki.api.credential.CredentialStatus; +import zeroecho.pki.api.credential.EndEntityProfileBinding; import zeroecho.pki.api.profile.LeafKeyUsage; import zeroecho.pki.api.request.SubjectAlternativeName; import zeroecho.pki.impl.core.ValidatedCaCertificateRequest; diff --git a/pki/src/main/java/zeroecho/pki/impl/framework/x509/bc/BcX509ProfileSupport.java b/pki/src/main/java/zeroecho/pki/impl/framework/x509/bc/BcX509ProfileSupport.java index 52308e1..c8c7034 100644 --- a/pki/src/main/java/zeroecho/pki/impl/framework/x509/bc/BcX509ProfileSupport.java +++ b/pki/src/main/java/zeroecho/pki/impl/framework/x509/bc/BcX509ProfileSupport.java @@ -19,8 +19,8 @@ import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x500.X500NameBuilder; import org.bouncycastle.asn1.x500.style.BCStyle; import org.bouncycastle.asn1.x509.BasicConstraints; -import org.bouncycastle.asn1.x509.Extension; import org.bouncycastle.asn1.x509.ExtendedKeyUsage; +import org.bouncycastle.asn1.x509.Extension; import org.bouncycastle.asn1.x509.GeneralName; import org.bouncycastle.asn1.x509.GeneralNames; import org.bouncycastle.asn1.x509.KeyPurposeId; diff --git a/pki/src/main/java/zeroecho/pki/impl/framework/x509/bc/BcX509ProofOfPossessionVerifier.java b/pki/src/main/java/zeroecho/pki/impl/framework/x509/bc/BcX509ProofOfPossessionVerifier.java index efa839c..41724b8 100644 --- a/pki/src/main/java/zeroecho/pki/impl/framework/x509/bc/BcX509ProofOfPossessionVerifier.java +++ b/pki/src/main/java/zeroecho/pki/impl/framework/x509/bc/BcX509ProofOfPossessionVerifier.java @@ -35,10 +35,10 @@ package zeroecho.pki.impl.framework.x509.bc; import java.util.Optional; +import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.operator.ContentVerifierProvider; import org.bouncycastle.operator.OperatorCreationException; import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder; -import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.pkcs.PKCS10CertificationRequest; import zeroecho.pki.api.attr.AttributeValue; diff --git a/pki/src/main/java/zeroecho/pki/impl/fs/FilesystemPkiStore.java b/pki/src/main/java/zeroecho/pki/impl/fs/FilesystemPkiStore.java index ff4bdfc..659fd6c 100644 --- a/pki/src/main/java/zeroecho/pki/impl/fs/FilesystemPkiStore.java +++ b/pki/src/main/java/zeroecho/pki/impl/fs/FilesystemPkiStore.java @@ -39,13 +39,13 @@ import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.channels.FileLock; import java.nio.channels.OverlappingFileLockException; +import java.nio.charset.StandardCharsets; import java.nio.file.AtomicMoveNotSupportedException; import java.nio.file.FileAlreadyExistsException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; import java.nio.file.StandardOpenOption; -import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.SecureRandom; import java.time.Clock; @@ -60,9 +60,9 @@ import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/pki/src/main/java/zeroecho/pki/impl/fs/FsCodec.java b/pki/src/main/java/zeroecho/pki/impl/fs/FsCodec.java index 1657d9b..997e43f 100644 --- a/pki/src/main/java/zeroecho/pki/impl/fs/FsCodec.java +++ b/pki/src/main/java/zeroecho/pki/impl/fs/FsCodec.java @@ -39,8 +39,8 @@ import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.time.Instant; import java.time.DateTimeException; +import java.time.Instant; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/pki/src/main/java/zeroecho/pki/impl/fs/FsPaths.java b/pki/src/main/java/zeroecho/pki/impl/fs/FsPaths.java index 16fd115..8db3064 100644 --- a/pki/src/main/java/zeroecho/pki/impl/fs/FsPaths.java +++ b/pki/src/main/java/zeroecho/pki/impl/fs/FsPaths.java @@ -33,8 +33,8 @@ ******************************************************************************/ package zeroecho.pki.impl.fs; -import java.nio.file.Path; import java.nio.charset.StandardCharsets; +import java.nio.file.Path; import java.util.Base64; import java.util.Objects; diff --git a/pki/src/main/java/zeroecho/pki/spi/crypto/SignatureWorkflowProvider.java b/pki/src/main/java/zeroecho/pki/spi/crypto/SignatureWorkflowProvider.java index f31822d..778bc0f 100644 --- a/pki/src/main/java/zeroecho/pki/spi/crypto/SignatureWorkflowProvider.java +++ b/pki/src/main/java/zeroecho/pki/spi/crypto/SignatureWorkflowProvider.java @@ -35,8 +35,8 @@ package zeroecho.pki.spi.crypto; import java.util.Objects; -import zeroecho.pki.spi.ProviderConfig; import zeroecho.pki.spi.ConfigurableProvider; +import zeroecho.pki.spi.ProviderConfig; /** * ServiceLoader provider for {@link SignatureWorkflow}. diff --git a/pki/src/test/java/zeroecho/pki/e2e/CaProfileIssuanceEnforcementTest.java b/pki/src/test/java/zeroecho/pki/e2e/CaProfileIssuanceEnforcementTest.java index b542a6d..8687a1f 100644 --- a/pki/src/test/java/zeroecho/pki/e2e/CaProfileIssuanceEnforcementTest.java +++ b/pki/src/test/java/zeroecho/pki/e2e/CaProfileIssuanceEnforcementTest.java @@ -4,8 +4,8 @@ ******************************************************************************/ package zeroecho.pki.e2e; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -21,14 +21,13 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Stream; -import org.bouncycastle.asn1.x509.BasicConstraints; import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.DERPrintableString; import org.bouncycastle.asn1.x500.RDN; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x500.style.BCStyle; +import org.bouncycastle.asn1.x509.BasicConstraints; import org.bouncycastle.asn1.x509.Extension; import org.bouncycastle.asn1.x509.KeyUsage; import org.bouncycastle.cert.X509CertificateHolder; @@ -39,10 +38,10 @@ import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; +import zeroecho.pki.api.CaService; import zeroecho.pki.api.EncodedObject; import zeroecho.pki.api.Encoding; import zeroecho.pki.api.KeyRef; -import zeroecho.pki.api.CaService; import zeroecho.pki.api.PkiException; import zeroecho.pki.api.PkiId; import zeroecho.pki.api.ProfileService; @@ -56,8 +55,8 @@ import zeroecho.pki.api.ca.IntermediateCreateCommand; import zeroecho.pki.api.credential.CaProfileBinding; import zeroecho.pki.api.credential.Credential; import zeroecho.pki.api.credential.CredentialBundle; -import zeroecho.pki.api.profile.BuiltInCertificateProfileCatalog; import zeroecho.pki.api.profile.ActiveCertificateProfile; +import zeroecho.pki.api.profile.BuiltInCertificateProfileCatalog; import zeroecho.pki.api.profile.BuiltInCertificateProfileTemplate; import zeroecho.pki.api.profile.CertificateProfileRef; import zeroecho.pki.api.profile.ImportedCertificateProfileVersion; diff --git a/pki/src/test/java/zeroecho/pki/e2e/H7EndEntityAcceptanceE2eTest.java b/pki/src/test/java/zeroecho/pki/e2e/H7EndEntityAcceptanceE2eTest.java index f375497..e19402f 100644 --- a/pki/src/test/java/zeroecho/pki/e2e/H7EndEntityAcceptanceE2eTest.java +++ b/pki/src/test/java/zeroecho/pki/e2e/H7EndEntityAcceptanceE2eTest.java @@ -75,21 +75,21 @@ import zeroecho.pki.api.Validity; import zeroecho.pki.api.audit.AuditEvent; import zeroecho.pki.api.ca.CaCreateCommand; import zeroecho.pki.api.credential.Credential; -import zeroecho.pki.api.credential.EndEntityProfileBinding; -import zeroecho.pki.api.profile.CertificateProfileRef; -import zeroecho.pki.api.profile.BuiltInCertificateProfileCatalog; -import zeroecho.pki.api.profile.BuiltInCertificateProfileTemplate; import zeroecho.pki.api.credential.CredentialBundle; import zeroecho.pki.api.credential.CredentialStatus; +import zeroecho.pki.api.credential.EndEntityProfileBinding; import zeroecho.pki.api.issuance.IssueEndEntityCommand; +import zeroecho.pki.api.profile.BuiltInCertificateProfileCatalog; +import zeroecho.pki.api.profile.BuiltInCertificateProfileTemplate; +import zeroecho.pki.api.profile.CertificateProfileRef; import zeroecho.pki.api.request.CertificationRequest; import zeroecho.pki.api.request.ParsedCertificationRequest; import zeroecho.pki.impl.core.ValidatedCaCertificateRequest; import zeroecho.pki.impl.core.ValidatedCertificateRequest; import zeroecho.pki.impl.core.attr.SimpleAttributeSet; import zeroecho.pki.spi.framework.CredentialIssuerBackend; -import zeroecho.pki.testkit.PkiTestRuntime; import zeroecho.pki.testkit.H7ProfileDocuments; +import zeroecho.pki.testkit.PkiTestRuntime; /** * End-to-end H7 acceptance evidence from signed PKCS#10 requests through durable diff --git a/pki/src/test/java/zeroecho/pki/e2e/H7EndEntityCsrRejectionE2eTest.java b/pki/src/test/java/zeroecho/pki/e2e/H7EndEntityCsrRejectionE2eTest.java index 801f23b..7ec4592 100644 --- a/pki/src/test/java/zeroecho/pki/e2e/H7EndEntityCsrRejectionE2eTest.java +++ b/pki/src/test/java/zeroecho/pki/e2e/H7EndEntityCsrRejectionE2eTest.java @@ -15,7 +15,6 @@ import java.nio.file.Path; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.time.Clock; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Optional; @@ -66,8 +65,8 @@ import zeroecho.pki.impl.core.attr.SimpleAttributeSet; import zeroecho.pki.impl.framework.x509.bc.BcX509Attributes; import zeroecho.pki.spi.framework.CredentialIssuerBackend; import zeroecho.pki.spi.store.PkiStore; -import zeroecho.pki.testkit.PkiTestRuntime; import zeroecho.pki.testkit.H7ProfileDocuments; +import zeroecho.pki.testkit.PkiTestRuntime; /** * Real signed-CSR rejection evidence for the closed H7 SAN and extension grammar. diff --git a/pki/src/test/java/zeroecho/pki/e2e/PkiCoreE2eTest.java b/pki/src/test/java/zeroecho/pki/e2e/PkiCoreE2eTest.java index 2504f50..7e6ec0b 100644 --- a/pki/src/test/java/zeroecho/pki/e2e/PkiCoreE2eTest.java +++ b/pki/src/test/java/zeroecho/pki/e2e/PkiCoreE2eTest.java @@ -33,18 +33,17 @@ ******************************************************************************/ package zeroecho.pki.e2e; -import java.math.BigInteger; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.math.BigInteger; import java.nio.file.Path; import java.security.KeyPair; import java.security.KeyPairGenerator; -import java.time.Duration; import java.time.Instant; import java.util.ArrayList; import java.util.HashMap; @@ -76,7 +75,6 @@ import zeroecho.pki.api.PkiId; import zeroecho.pki.api.RevocationService; import zeroecho.pki.api.StatusObjectService; import zeroecho.pki.api.SubjectRef; -import zeroecho.pki.api.Validity; import zeroecho.pki.api.attr.AttributeSet; import zeroecho.pki.api.ca.CaCreateCommand; import zeroecho.pki.api.ca.CaRecord; @@ -95,14 +93,14 @@ import zeroecho.pki.api.request.ParsedCertificationRequest; import zeroecho.pki.api.request.ProofOfPossessionResult; import zeroecho.pki.api.request.ProofOfPossessionStatus; import zeroecho.pki.api.request.RequestStorePolicy; -import zeroecho.pki.api.revocation.RevocationReason; import zeroecho.pki.api.revocation.RevocationCommand; +import zeroecho.pki.api.revocation.RevocationReason; import zeroecho.pki.api.status.StatusObject; import zeroecho.pki.api.status.StatusObjectGenerateCommand; import zeroecho.pki.api.status.StatusObjectType; -import zeroecho.pki.impl.core.attr.SimpleAttributeSet; import zeroecho.pki.impl.core.ValidatedCaCertificateRequest; import zeroecho.pki.impl.core.ValidatedCertificateRequest; +import zeroecho.pki.impl.core.attr.SimpleAttributeSet; import zeroecho.pki.spi.framework.CredentialIssuerBackend; import zeroecho.pki.testkit.PkiTestRuntime; diff --git a/pki/src/test/java/zeroecho/pki/e2e/PkiProofGateE2eTest.java b/pki/src/test/java/zeroecho/pki/e2e/PkiProofGateE2eTest.java index 14b2cc8..a104282 100644 --- a/pki/src/test/java/zeroecho/pki/e2e/PkiProofGateE2eTest.java +++ b/pki/src/test/java/zeroecho/pki/e2e/PkiProofGateE2eTest.java @@ -48,8 +48,8 @@ import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.MessageDigest; import java.security.PublicKey; -import java.time.Duration; import java.time.Clock; +import java.time.Duration; import java.time.Instant; import java.util.HashMap; import java.util.HexFormat; @@ -101,14 +101,14 @@ import zeroecho.pki.api.ca.IntermediateCreateCommand; import zeroecho.pki.api.credential.CaProfileBinding; import zeroecho.pki.api.credential.Credential; import zeroecho.pki.api.credential.CredentialBundle; -import zeroecho.pki.api.credential.CredentialStatus; import zeroecho.pki.api.credential.CredentialProfileBinding; +import zeroecho.pki.api.credential.CredentialStatus; import zeroecho.pki.api.credential.EndEntityProfileBinding; import zeroecho.pki.api.issuance.IssueEndEntityCommand; -import zeroecho.pki.api.profile.CertificateProfileRef; import zeroecho.pki.api.issuance.ReissueCommand; import zeroecho.pki.api.issuance.RenewCommand; import zeroecho.pki.api.issuance.ReplaceCommand; +import zeroecho.pki.api.profile.CertificateProfileRef; import zeroecho.pki.api.request.CertificationRequest; import zeroecho.pki.api.request.ParsedCertificationRequest; import zeroecho.pki.api.request.ProofOfPossessionResult; diff --git a/pki/src/test/java/zeroecho/pki/impl/core/DefaultRevocationServiceTest.java b/pki/src/test/java/zeroecho/pki/impl/core/DefaultRevocationServiceTest.java index 55b2d8a..8768153 100644 --- a/pki/src/test/java/zeroecho/pki/impl/core/DefaultRevocationServiceTest.java +++ b/pki/src/test/java/zeroecho/pki/impl/core/DefaultRevocationServiceTest.java @@ -13,8 +13,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.reflect.Proxy; import java.time.Clock; import java.time.Instant; -import java.time.ZoneOffset; import java.time.ZoneId; +import java.time.ZoneOffset; import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/pki/src/test/java/zeroecho/pki/impl/core/DefaultStatusObjectServiceCrlTest.java b/pki/src/test/java/zeroecho/pki/impl/core/DefaultStatusObjectServiceCrlTest.java index d968f5b..01204bd 100644 --- a/pki/src/test/java/zeroecho/pki/impl/core/DefaultStatusObjectServiceCrlTest.java +++ b/pki/src/test/java/zeroecho/pki/impl/core/DefaultStatusObjectServiceCrlTest.java @@ -18,12 +18,10 @@ import java.nio.file.Path; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.time.Instant; -import java.time.ZoneOffset; import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Optional; @@ -54,9 +52,8 @@ import zeroecho.pki.api.SubjectRef; import zeroecho.pki.api.attr.AttributeSet; import zeroecho.pki.api.attr.AttributeValue; import zeroecho.pki.api.ca.CaCreateCommand; -import zeroecho.pki.api.ca.CaRecord; -import zeroecho.pki.api.credential.Credential; import zeroecho.pki.api.credential.CaProfileBinding; +import zeroecho.pki.api.credential.Credential; import zeroecho.pki.api.credential.CredentialStatus; import zeroecho.pki.api.credential.CredentialUse; import zeroecho.pki.api.credential.EffectiveCredentialStatus; @@ -76,8 +73,8 @@ import zeroecho.pki.api.status.StatusObjectType; import zeroecho.pki.impl.core.attr.SimpleAttributeSet; import zeroecho.pki.impl.framework.x509.bc.BcX509Attributes; import zeroecho.pki.impl.framework.x509.bc.BcX509CredentialFramework; -import zeroecho.pki.spi.framework.CrlEntry; import zeroecho.pki.spi.framework.CredentialFramework; +import zeroecho.pki.spi.framework.CrlEntry; import zeroecho.pki.spi.framework.StatusObjectGenerator; import zeroecho.pki.spi.store.PkiStore; import zeroecho.pki.testkit.PkiTestRuntime; diff --git a/pki/src/test/java/zeroecho/pki/impl/core/H7ProfileEnforcementTest.java b/pki/src/test/java/zeroecho/pki/impl/core/H7ProfileEnforcementTest.java index 3f1034d..7bb65e9 100644 --- a/pki/src/test/java/zeroecho/pki/impl/core/H7ProfileEnforcementTest.java +++ b/pki/src/test/java/zeroecho/pki/impl/core/H7ProfileEnforcementTest.java @@ -31,10 +31,8 @@ import java.util.Set; import org.bouncycastle.asn1.ASN1Encodable; import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.DERBMPString; -import org.bouncycastle.asn1.DERIA5String; import org.bouncycastle.asn1.DERNull; import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.DERPrintableString; import org.bouncycastle.asn1.DERSequence; import org.bouncycastle.asn1.DERUTF8String; import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; @@ -43,9 +41,9 @@ import org.bouncycastle.asn1.x500.X500NameBuilder; import org.bouncycastle.asn1.x500.style.BCStyle; import org.bouncycastle.asn1.x509.AlgorithmIdentifier; import org.bouncycastle.asn1.x509.BasicConstraints; +import org.bouncycastle.asn1.x509.ExtendedKeyUsage; import org.bouncycastle.asn1.x509.Extension; import org.bouncycastle.asn1.x509.Extensions; -import org.bouncycastle.asn1.x509.ExtendedKeyUsage; import org.bouncycastle.asn1.x509.GeneralName; import org.bouncycastle.asn1.x509.GeneralNames; import org.bouncycastle.asn1.x509.KeyPurposeId; @@ -61,31 +59,29 @@ import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import zeroecho.pki.api.CertificationRequestService; import zeroecho.pki.api.EncodedObject; import zeroecho.pki.api.Encoding; -import zeroecho.pki.api.FormatId; import zeroecho.pki.api.IssuerRef; import zeroecho.pki.api.KeyRef; import zeroecho.pki.api.PkiException; -import zeroecho.pki.api.ProfileService; import zeroecho.pki.api.PkiId; +import zeroecho.pki.api.ProfileService; import zeroecho.pki.api.SubjectRef; import zeroecho.pki.api.Validity; import zeroecho.pki.api.attr.AttributeSet; import zeroecho.pki.api.attr.AttributeValue; import zeroecho.pki.api.ca.CaCreateCommand; -import zeroecho.pki.api.credential.CredentialProfileBinding; -import zeroecho.pki.api.credential.Credential; import zeroecho.pki.api.credential.CaProfileBinding; +import zeroecho.pki.api.credential.Credential; +import zeroecho.pki.api.credential.CredentialProfileBinding; import zeroecho.pki.api.credential.CredentialStatus; import zeroecho.pki.api.credential.EndEntityProfileBinding; import zeroecho.pki.api.issuance.IssueEndEntityCommand; +import zeroecho.pki.api.profile.ActiveCertificateProfile; import zeroecho.pki.api.profile.CertificateProfile; import zeroecho.pki.api.profile.CertificateProfileDefinition; import zeroecho.pki.api.profile.CertificateProfileDocumentCodec; import zeroecho.pki.api.profile.CertificateProfileRef; -import zeroecho.pki.api.profile.ActiveCertificateProfile; import zeroecho.pki.api.profile.ExtendedKeyUsageId; import zeroecho.pki.api.profile.LeafCertificatePolicy; import zeroecho.pki.api.profile.LeafKeyUsage; @@ -105,7 +101,6 @@ import zeroecho.pki.impl.framework.x509.bc.BcX509Attributes; import zeroecho.pki.impl.framework.x509.bc.BcX509CertificationRequestParser; import zeroecho.pki.impl.framework.x509.bc.BcX509CredentialFramework; import zeroecho.pki.impl.framework.x509.bc.BcX509ProfileSupport; -import zeroecho.pki.spi.store.PkiStore; import zeroecho.pki.testkit.H7ProfileDocuments; import zeroecho.pki.testkit.PkiTestRuntime; diff --git a/pki/src/test/java/zeroecho/pki/impl/core/StoreBackedEffectiveCredentialStatusResolverTest.java b/pki/src/test/java/zeroecho/pki/impl/core/StoreBackedEffectiveCredentialStatusResolverTest.java index 124ed6a..0968729 100644 --- a/pki/src/test/java/zeroecho/pki/impl/core/StoreBackedEffectiveCredentialStatusResolverTest.java +++ b/pki/src/test/java/zeroecho/pki/impl/core/StoreBackedEffectiveCredentialStatusResolverTest.java @@ -60,8 +60,8 @@ import zeroecho.pki.api.PkiId; import zeroecho.pki.api.SubjectRef; import zeroecho.pki.api.Validity; import zeroecho.pki.api.audit.AuditEvent; -import zeroecho.pki.api.credential.Credential; import zeroecho.pki.api.credential.CaProfileBinding; +import zeroecho.pki.api.credential.Credential; import zeroecho.pki.api.credential.CredentialStatus; import zeroecho.pki.api.credential.CredentialUse; import zeroecho.pki.api.credential.EffectiveCredentialStatus; diff --git a/pki/src/test/java/zeroecho/pki/impl/core/async/PkiSigningBusFailureTest.java b/pki/src/test/java/zeroecho/pki/impl/core/async/PkiSigningBusFailureTest.java index dcb8815..2102192 100644 --- a/pki/src/test/java/zeroecho/pki/impl/core/async/PkiSigningBusFailureTest.java +++ b/pki/src/test/java/zeroecho/pki/impl/core/async/PkiSigningBusFailureTest.java @@ -33,8 +33,8 @@ ******************************************************************************/ package zeroecho.pki.impl.core.async; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -45,8 +45,8 @@ import java.lang.reflect.Proxy; import java.nio.file.Path; import java.security.KeyPair; import java.security.KeyPairGenerator; -import java.time.Duration; import java.time.Clock; +import java.time.Duration; import java.time.Instant; import java.time.ZoneId; import java.util.Map; @@ -67,6 +67,7 @@ import org.junit.jupiter.api.io.TempDir; import zeroecho.pki.api.EncodedObject; import zeroecho.pki.api.Encoding; import zeroecho.pki.api.KeyRef; +import zeroecho.pki.api.PkiException; import zeroecho.pki.api.PkiId; import zeroecho.pki.api.audit.AccessContext; import zeroecho.pki.api.audit.Principal; @@ -75,7 +76,6 @@ import zeroecho.pki.api.orch.OrchestrationDurabilityPolicy; import zeroecho.pki.api.orch.WorkflowStateRecord; import zeroecho.pki.impl.fs.FilesystemPkiStore; import zeroecho.pki.impl.fs.FsPkiStoreOptions; -import zeroecho.pki.api.PkiException; import zeroecho.pki.spi.crypto.SignatureWorkflow; import zeroecho.pki.spi.store.PkiStore; import zeroecho.pki.spi.store.SignWorkflowStore; diff --git a/pki/src/test/java/zeroecho/pki/impl/crypto/zeroecholib/ZeroEchoLibSignatureWorkflowPersistenceTest.java b/pki/src/test/java/zeroecho/pki/impl/crypto/zeroecholib/ZeroEchoLibSignatureWorkflowPersistenceTest.java index 0e764f8..40c03fc 100644 --- a/pki/src/test/java/zeroecho/pki/impl/crypto/zeroecholib/ZeroEchoLibSignatureWorkflowPersistenceTest.java +++ b/pki/src/test/java/zeroecho/pki/impl/crypto/zeroecholib/ZeroEchoLibSignatureWorkflowPersistenceTest.java @@ -39,8 +39,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import java.nio.ByteBuffer; -import java.nio.file.Path; import java.nio.file.Files; +import java.nio.file.Path; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.SecureRandom; @@ -53,8 +53,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Executors; import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; @@ -67,6 +67,7 @@ import java.util.logging.Logger; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; +import zeroecho.core.storage.KeyringStore; import zeroecho.pki.api.EncodedObject; import zeroecho.pki.api.Encoding; import zeroecho.pki.api.KeyRef; @@ -76,9 +77,6 @@ import zeroecho.pki.api.audit.Principal; import zeroecho.pki.api.audit.Purpose; import zeroecho.pki.api.orch.SigningSubmissionId; import zeroecho.pki.spi.crypto.SignatureWorkflow; -import zeroecho.core.alg.rsa.RsaPrivateKeySpec; -import zeroecho.core.alg.rsa.RsaPublicKeySpec; -import zeroecho.core.storage.KeyringStore; final class ZeroEchoLibSignatureWorkflowPersistenceTest { diff --git a/pki/src/test/java/zeroecho/pki/impl/framework/x509/bc/WorkflowProofOfPossessionVerifierTest.java b/pki/src/test/java/zeroecho/pki/impl/framework/x509/bc/WorkflowProofOfPossessionVerifierTest.java index 18a15f9..aa5808c 100644 --- a/pki/src/test/java/zeroecho/pki/impl/framework/x509/bc/WorkflowProofOfPossessionVerifierTest.java +++ b/pki/src/test/java/zeroecho/pki/impl/framework/x509/bc/WorkflowProofOfPossessionVerifierTest.java @@ -41,10 +41,10 @@ import java.security.KeyPairGenerator; import java.util.Map; import java.util.Optional; +import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; import org.bouncycastle.pkcs.PKCS10CertificationRequest; import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder; -import org.bouncycastle.asn1.x500.X500Name; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/pki/src/test/java/zeroecho/pki/impl/fs/FilesystemPkiStoreTest.java b/pki/src/test/java/zeroecho/pki/impl/fs/FilesystemPkiStoreTest.java index 451c42c..86173c0 100644 --- a/pki/src/test/java/zeroecho/pki/impl/fs/FilesystemPkiStoreTest.java +++ b/pki/src/test/java/zeroecho/pki/impl/fs/FilesystemPkiStoreTest.java @@ -70,9 +70,13 @@ import zeroecho.pki.api.audit.Principal; import zeroecho.pki.api.ca.CaKind; import zeroecho.pki.api.ca.CaRecord; import zeroecho.pki.api.ca.CaState; -import zeroecho.pki.api.credential.Credential; import zeroecho.pki.api.credential.CaProfileBinding; +import zeroecho.pki.api.credential.Credential; import zeroecho.pki.api.credential.CredentialStatus; +import zeroecho.pki.api.orch.OrchestrationDurabilityPolicy; +import zeroecho.pki.api.orch.WorkflowStateRecord; +import zeroecho.pki.api.policy.PolicyTrace; +import zeroecho.pki.api.policy.PolicyTraceStep; import zeroecho.pki.api.profile.CertificateProfile; import zeroecho.pki.api.profile.CertificateProfileDefinition; import zeroecho.pki.api.profile.CertificateProfileDocumentCodec; @@ -86,8 +90,6 @@ import zeroecho.pki.api.profile.SubjectAlternativeNamePolicy; import zeroecho.pki.api.profile.SubjectPolicy; import zeroecho.pki.api.profile.SubjectRdnRule; import zeroecho.pki.api.profile.SubjectRdnType; -import zeroecho.pki.api.policy.PolicyTrace; -import zeroecho.pki.api.policy.PolicyTraceStep; import zeroecho.pki.api.publication.PublicationRecord; import zeroecho.pki.api.publication.PublicationStatus; import zeroecho.pki.api.publication.PublicationTarget; @@ -98,8 +100,6 @@ import zeroecho.pki.api.revocation.RevocationJournal; import zeroecho.pki.api.revocation.RevocationReason; import zeroecho.pki.api.status.StatusObject; import zeroecho.pki.api.status.StatusObjectType; -import zeroecho.pki.api.orch.OrchestrationDurabilityPolicy; -import zeroecho.pki.api.orch.WorkflowStateRecord; /** * Tests for {@link FilesystemPkiStore}. diff --git a/pki/src/test/java/zeroecho/pki/impl/fs/FilesystemProfileLifecycleTest.java b/pki/src/test/java/zeroecho/pki/impl/fs/FilesystemProfileLifecycleTest.java index faedfff..7a2e4fe 100644 --- a/pki/src/test/java/zeroecho/pki/impl/fs/FilesystemProfileLifecycleTest.java +++ b/pki/src/test/java/zeroecho/pki/impl/fs/FilesystemProfileLifecycleTest.java @@ -31,8 +31,8 @@ import zeroecho.pki.api.PkiException; import zeroecho.pki.api.profile.BuiltInCertificateProfileCatalog; import zeroecho.pki.api.profile.BuiltInCertificateProfileTemplate; import zeroecho.pki.api.profile.CertificateProfileDefinition; -import zeroecho.pki.api.profile.CertificateProfileRef; import zeroecho.pki.api.profile.CertificateProfileKind; +import zeroecho.pki.api.profile.CertificateProfileRef; import zeroecho.pki.api.profile.ImportedCertificateProfileVersion; import zeroecho.pki.impl.audit.InMemoryAuditSink; import zeroecho.pki.impl.core.DefaultProfileService; diff --git a/pki/src/test/java/zeroecho/pki/impl/fs/FilesystemRevocationJournalTest.java b/pki/src/test/java/zeroecho/pki/impl/fs/FilesystemRevocationJournalTest.java index 2a48937..c2861e3 100644 --- a/pki/src/test/java/zeroecho/pki/impl/fs/FilesystemRevocationJournalTest.java +++ b/pki/src/test/java/zeroecho/pki/impl/fs/FilesystemRevocationJournalTest.java @@ -14,7 +14,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Method; -import java.nio.file.Files; import java.nio.file.Path; import java.time.Clock; import java.time.Instant; @@ -47,8 +46,8 @@ import zeroecho.pki.api.Validity; import zeroecho.pki.api.attr.AttributeId; import zeroecho.pki.api.attr.AttributeSet; import zeroecho.pki.api.attr.AttributeValue; -import zeroecho.pki.api.credential.Credential; import zeroecho.pki.api.credential.CaProfileBinding; +import zeroecho.pki.api.credential.Credential; import zeroecho.pki.api.credential.CredentialStatus; import zeroecho.pki.api.credential.EffectiveCredentialStatus; import zeroecho.pki.api.revocation.RevocationCommand; diff --git a/pki/src/test/java/zeroecho/pki/impl/fs/FilesystemSignWorkflowStoreTest.java b/pki/src/test/java/zeroecho/pki/impl/fs/FilesystemSignWorkflowStoreTest.java index ea2da3c..a1ba6fa 100644 --- a/pki/src/test/java/zeroecho/pki/impl/fs/FilesystemSignWorkflowStoreTest.java +++ b/pki/src/test/java/zeroecho/pki/impl/fs/FilesystemSignWorkflowStoreTest.java @@ -52,8 +52,8 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Executors; import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/pki/src/test/java/zeroecho/pki/spi/bootstrap/PkiBootstrapTest.java b/pki/src/test/java/zeroecho/pki/spi/bootstrap/PkiBootstrapTest.java index c67a36c..730d80e 100644 --- a/pki/src/test/java/zeroecho/pki/spi/bootstrap/PkiBootstrapTest.java +++ b/pki/src/test/java/zeroecho/pki/spi/bootstrap/PkiBootstrapTest.java @@ -69,12 +69,12 @@ import zeroecho.core.storage.KeyringStore; import zeroecho.pki.api.EncodedObject; import zeroecho.pki.api.Encoding; import zeroecho.pki.api.KeyRef; +import zeroecho.pki.api.PkiException; import zeroecho.pki.api.PkiId; -import zeroecho.pki.api.audit.Principal; import zeroecho.pki.api.audit.AccessContext; +import zeroecho.pki.api.audit.Principal; import zeroecho.pki.api.audit.Purpose; import zeroecho.pki.api.orch.SigningSubmissionId; -import zeroecho.pki.api.PkiException; import zeroecho.pki.impl.crypto.zeroecholib.ZeroEchoLibSignatureWorkflowProvider; import zeroecho.pki.spi.ProviderConfig; import zeroecho.pki.spi.audit.AuditSink; diff --git a/pki/src/test/java/zeroecho/pki/testkit/PkiTestRuntime.java b/pki/src/test/java/zeroecho/pki/testkit/PkiTestRuntime.java index 2c9d838..40131d6 100644 --- a/pki/src/test/java/zeroecho/pki/testkit/PkiTestRuntime.java +++ b/pki/src/test/java/zeroecho/pki/testkit/PkiTestRuntime.java @@ -50,21 +50,21 @@ import zeroecho.pki.api.EncodedObject; import zeroecho.pki.api.Encoding; import zeroecho.pki.api.IssuanceService; import zeroecho.pki.api.KeyRef; -import zeroecho.pki.api.RevocationService; import zeroecho.pki.api.ProfileService; +import zeroecho.pki.api.RevocationService; import zeroecho.pki.api.StatusObjectService; import zeroecho.pki.api.credential.EffectiveCredentialStatusResolver; import zeroecho.pki.api.profile.BuiltInCertificateProfileCatalog; +import zeroecho.pki.impl.audit.InMemoryAuditSink; import zeroecho.pki.impl.core.DefaultCaService; import zeroecho.pki.impl.core.DefaultCertificationRequestService; import zeroecho.pki.impl.core.DefaultIssuanceService; -import zeroecho.pki.impl.core.DefaultRevocationService; import zeroecho.pki.impl.core.DefaultProfileService; +import zeroecho.pki.impl.core.DefaultRevocationService; import zeroecho.pki.impl.core.DefaultStatusObjectService; import zeroecho.pki.impl.core.StoreBackedEffectiveCredentialStatusResolver; import zeroecho.pki.impl.core.async.PkiSigningBus; import zeroecho.pki.impl.core.attr.SimpleAttributeSet; -import zeroecho.pki.impl.audit.InMemoryAuditSink; import zeroecho.pki.impl.framework.x509.bc.BcX509CredentialFramework; import zeroecho.pki.impl.framework.x509.bc.BcX509CredentialIssuerBackend; import zeroecho.pki.impl.framework.x509.bc.BcX509StatusObjectGenerator; diff --git a/samples/src/test/java/demo/AesTest.java b/samples/src/test/java/demo/AesTest.java index 6d755e9..f1f469b 100644 --- a/samples/src/test/java/demo/AesTest.java +++ b/samples/src/test/java/demo/AesTest.java @@ -50,18 +50,17 @@ import org.junit.jupiter.api.Test; import conflux.Ctx; import conflux.CtxInterface; import zeroecho.core.ConfluxKeys; -import zeroecho.core.CryptoAlgorithm; import zeroecho.core.KeyUsage; import zeroecho.core.alg.aes.AesKeyGenSpec; import zeroecho.core.alg.aes.AesSpec; import zeroecho.core.context.EncryptionContext; import zeroecho.core.spi.ContextAware; import zeroecho.core.util.Strings; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.alg.AesDataContentBuilder; import zeroecho.sdk.builders.core.DataContentChainBuilder; import zeroecho.sdk.builders.core.PlainBytesBuilder; import zeroecho.sdk.content.api.DataContent; -import zeroecho.sdk.ZeroEchoSession; @Tag("sample") class AesTest { diff --git a/samples/src/test/java/demo/AgreementVariantsTest.java b/samples/src/test/java/demo/AgreementVariantsTest.java index 1480885..21184a5 100644 --- a/samples/src/test/java/demo/AgreementVariantsTest.java +++ b/samples/src/test/java/demo/AgreementVariantsTest.java @@ -44,8 +44,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import zeroecho.core.CryptoAlgorithm; -import zeroecho.core.CryptoAlgorithms; import zeroecho.core.KeyUsage; import zeroecho.core.alg.common.agreement.KeyPairKey; import zeroecho.core.alg.kyber.KyberKeyGenSpec; @@ -53,8 +51,8 @@ import zeroecho.core.alg.xdh.XdhSpec; import zeroecho.core.context.AgreementContext; import zeroecho.core.context.MessageAgreementContext; import zeroecho.core.spec.VoidSpec; -import zeroecho.sdk.ZeroEchoSession; import zeroecho.core.util.Strings; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.util.BouncyCastleActivator; /** diff --git a/samples/src/test/java/demo/CombinedDeliveryTest.java b/samples/src/test/java/demo/CombinedDeliveryTest.java index cab260c..8a13e3a 100644 --- a/samples/src/test/java/demo/CombinedDeliveryTest.java +++ b/samples/src/test/java/demo/CombinedDeliveryTest.java @@ -52,14 +52,14 @@ import zeroecho.core.alg.elgamal.ElgamalParamSpec; import zeroecho.core.alg.kyber.KyberKeyGenSpec; import zeroecho.core.alg.rsa.RsaKeyGenSpec; import zeroecho.core.util.Strings; +import zeroecho.sdk.Pbkdf2Limits; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.alg.AesDataContentBuilder; import zeroecho.sdk.builders.core.DataContentChainBuilder; import zeroecho.sdk.builders.core.PlainBytesBuilder; import zeroecho.sdk.content.api.DataContent; import zeroecho.sdk.guard.MultiRecipientDataSourceBuilder; import zeroecho.sdk.guard.UnlockMaterial; -import zeroecho.sdk.Pbkdf2Limits; -import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.util.BouncyCastleActivator; @Tag("sample") diff --git a/samples/src/test/java/demo/HybridDerivedAesDemoTest.java b/samples/src/test/java/demo/HybridDerivedAesDemoTest.java index e3443e7..9efc3ee 100644 --- a/samples/src/test/java/demo/HybridDerivedAesDemoTest.java +++ b/samples/src/test/java/demo/HybridDerivedAesDemoTest.java @@ -47,6 +47,7 @@ import org.junit.jupiter.api.Test; import zeroecho.core.alg.kyber.KyberKeyGenSpec; import zeroecho.core.alg.xdh.XdhSpec; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.HybridKexBuilder; import zeroecho.sdk.builders.alg.AesDataContentBuilder; import zeroecho.sdk.builders.core.DataContentChainBuilder; @@ -56,7 +57,6 @@ import zeroecho.sdk.hybrid.derived.HybridDerived; import zeroecho.sdk.hybrid.kex.HybridKexContext; import zeroecho.sdk.hybrid.kex.HybridKexExporter; import zeroecho.sdk.hybrid.kex.HybridKexProfile; -import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.hybrid.kex.HybridKexTranscript; import zeroecho.sdk.util.BouncyCastleActivator; diff --git a/samples/src/test/java/demo/HybridKexDemoTest.java b/samples/src/test/java/demo/HybridKexDemoTest.java index 2470f54..665ab5c 100644 --- a/samples/src/test/java/demo/HybridKexDemoTest.java +++ b/samples/src/test/java/demo/HybridKexDemoTest.java @@ -46,10 +46,10 @@ import org.junit.jupiter.api.Test; import zeroecho.core.alg.common.agreement.KeyPairKey; import zeroecho.core.alg.kyber.KyberKeyGenSpec; import zeroecho.core.alg.xdh.XdhSpec; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.hybrid.kex.HybridKexContext; import zeroecho.sdk.hybrid.kex.HybridKexContexts; import zeroecho.sdk.hybrid.kex.HybridKexProfile; -import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.util.BouncyCastleActivator; /** diff --git a/samples/src/test/java/demo/HybridSigningAesTest.java b/samples/src/test/java/demo/HybridSigningAesTest.java index 8890d98..d7c7d7d 100644 --- a/samples/src/test/java/demo/HybridSigningAesTest.java +++ b/samples/src/test/java/demo/HybridSigningAesTest.java @@ -52,8 +52,8 @@ import org.junit.jupiter.api.Test; import zeroecho.core.alg.ed25519.Ed25519KeyGenSpec; import zeroecho.core.alg.sphincsplus.SphincsPlusKeyGenSpec; import zeroecho.core.context.SignatureContext; -import zeroecho.sdk.builders.TagTrailerDataContentBuilder; import zeroecho.sdk.ZeroEchoSession; +import zeroecho.sdk.builders.TagTrailerDataContentBuilder; import zeroecho.sdk.builders.alg.AesDataContentBuilder; import zeroecho.sdk.builders.core.DataContentChainBuilder; import zeroecho.sdk.builders.core.PlainBytesBuilder; diff --git a/samples/src/test/java/demo/PostQuantumTest.java b/samples/src/test/java/demo/PostQuantumTest.java index 789bbd9..638723c 100644 --- a/samples/src/test/java/demo/PostQuantumTest.java +++ b/samples/src/test/java/demo/PostQuantumTest.java @@ -50,13 +50,13 @@ import org.junit.jupiter.api.TestInstance; import zeroecho.core.alg.kyber.KyberKeyGenSpec; import zeroecho.core.util.Strings; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.alg.AesDataContentBuilder; import zeroecho.sdk.builders.alg.KemDataContentBuilder; import zeroecho.sdk.builders.core.DataContentChainBuilder; import zeroecho.sdk.builders.core.PlainBytesBuilder; import zeroecho.sdk.content.api.DataContent; import zeroecho.sdk.util.BouncyCastleActivator; -import zeroecho.sdk.ZeroEchoSession; @Tag("sample") @TestInstance(TestInstance.Lifecycle.PER_CLASS) diff --git a/samples/src/test/java/demo/SigningAesTest.java b/samples/src/test/java/demo/SigningAesTest.java index c634a09..d308ea8 100644 --- a/samples/src/test/java/demo/SigningAesTest.java +++ b/samples/src/test/java/demo/SigningAesTest.java @@ -53,12 +53,12 @@ import zeroecho.core.alg.rsa.RsaSigSpec; import zeroecho.core.tag.TagEngine; import zeroecho.core.tag.TagEngineBuilder; import zeroecho.core.util.Strings; +import zeroecho.sdk.ZeroEchoSession; import zeroecho.sdk.builders.TagTrailerDataContentBuilder; import zeroecho.sdk.builders.alg.AesDataContentBuilder; import zeroecho.sdk.builders.core.DataContentChainBuilder; import zeroecho.sdk.builders.core.PlainBytesBuilder; import zeroecho.sdk.content.api.DataContent; -import zeroecho.sdk.ZeroEchoSession; @Tag("sample") class SigningAesTest {