From 0a0d4ac87d3d3c3c93c11de76d78f5a9b610eb91 Mon Sep 17 00:00:00 2001 From: Mart Somermaa Date: Mon, 3 Nov 2025 19:03:22 +0200 Subject: [PATCH 1/7] Update copyright year and bump version to 2.2.0-SNAPSHOT WE2-1132 Signed-off-by: Mart Somermaa --- LICENSE | 2 +- pom.xml | 2 +- .../security/authtoken/WebEidAuthToken.java | 2 +- .../security/certificate/CertificateData.java | 2 +- .../certificate/CertificateLoader.java | 2 +- .../certificate/CertificateValidator.java | 2 +- .../SubjectCertificatePolicies.java | 2 +- .../security/challenge/ChallengeNonce.java | 2 +- .../challenge/ChallengeNonceGenerator.java | 2 +- .../ChallengeNonceGeneratorBuilder.java | 2 +- .../ChallengeNonceGeneratorImpl.java | 2 +- .../challenge/ChallengeNonceStore.java | 2 +- .../exceptions/AuthTokenException.java | 2 +- .../exceptions/AuthTokenParseException.java | 2 +- ...AuthTokenSignatureValidationException.java | 2 +- .../CertificateDecodingException.java | 2 +- .../CertificateExpiredException.java | 2 +- .../CertificateNotTrustedException.java | 2 +- .../CertificateNotYetValidException.java | 2 +- .../ChallengeNonceExpiredException.java | 2 +- .../ChallengeNonceNotFoundException.java | 2 +- .../ChallengeNullOrEmptyException.java | 2 +- .../security/exceptions/JceException.java | 2 +- .../exceptions/OCSPCertificateException.java | 2 +- ...rCertificateDisallowedPolicyException.java | 2 +- ...serCertificateMissingPurposeException.java | 2 +- ...erCertificateOCSPCheckFailedException.java | 2 +- .../UserCertificateParseException.java | 2 +- .../UserCertificateRevokedException.java | 2 +- .../UserCertificateWrongPurposeException.java | 2 +- .../webeid/security/util/Base64Decoder.java | 2 +- .../eu/webeid/security/util/Collections.java | 2 +- .../eu/webeid/security/util/DateAndTime.java | 2 +- .../java/eu/webeid/security/util/Strings.java | 2 +- .../AuthTokenSignatureValidator.java | 2 +- .../AuthTokenValidationConfiguration.java | 2 +- .../validator/AuthTokenValidator.java | 2 +- .../validator/AuthTokenValidatorBuilder.java | 2 +- .../validator/AuthTokenValidatorImpl.java | 2 +- .../SubjectCertificateExpiryValidator.java | 2 +- ...SubjectCertificateNotRevokedValidator.java | 2 +- .../SubjectCertificatePolicyValidator.java | 2 +- .../SubjectCertificatePurposeValidator.java | 2 +- .../SubjectCertificateTrustedValidator.java | 2 +- .../SubjectCertificateValidator.java | 2 +- .../SubjectCertificateValidatorBatch.java | 2 +- .../security/validator/ocsp/Digester.java | 2 +- .../security/validator/ocsp/OcspClient.java | 2 +- .../validator/ocsp/OcspRequestBuilder.java | 4 ++-- .../validator/ocsp/OcspResponseValidator.java | 2 +- .../validator/ocsp/OcspServiceProvider.java | 2 +- .../security/validator/ocsp/OcspUrl.java | 2 +- .../validator/ocsp/OkHttpOcspClient.java | 2 +- .../ocsp/service/AiaOcspService.java | 2 +- .../service/AiaOcspServiceConfiguration.java | 2 +- .../ocsp/service/DesignatedOcspService.java | 2 +- .../DesignatedOcspServiceConfiguration.java | 2 +- .../validator/ocsp/service/OcspService.java | 2 +- .../certificate/CertificateDataTest.java | 21 +++++++++++++++++++ .../ChallengeNonceGeneratorTest.java | 2 +- .../InMemoryChallengeNonceStore.java | 2 +- .../testutil/AbstractTestWithValidator.java | 2 +- .../testutil/AuthTokenValidators.java | 2 +- .../security/testutil/Certificates.java | 2 +- .../eu/webeid/security/testutil/Dates.java | 2 +- .../security/testutil/OcspServiceMaker.java | 2 +- .../validator/AuthTokenAlgorithmTest.java | 2 +- .../validator/AuthTokenCertificateTest.java | 2 +- .../validator/AuthTokenSignatureTest.java | 2 +- .../AuthTokenSignatureValidatorTest.java | 2 +- .../validator/AuthTokenStructureTest.java | 2 +- .../AuthTokenValidatorBuilderTest.java | 2 +- ...ectCertificateNotRevokedValidatorTest.java | 2 +- .../ocsp/OcspClientOverrideTest.java | 2 +- .../ocsp/OcspResponseValidatorTest.java | 2 +- .../ocsp/OcspServiceProviderTest.java | 2 +- .../security/validator/ocsp/OcspUrlTest.java | 2 +- 77 files changed, 98 insertions(+), 77 deletions(-) diff --git a/LICENSE b/LICENSE index 326ac324..a7252dec 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Estonian Information System Authority +Copyright (c) 2020-2025 Estonian Information System Authority Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pom.xml b/pom.xml index 8fac8355..b2ba3494 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 authtoken-validation org.webeid.security - 2.1.2 + 2.2.0-SNAPSHOT jar authtoken-validation Web eID authentication token validation library for Java diff --git a/src/main/java/eu/webeid/security/authtoken/WebEidAuthToken.java b/src/main/java/eu/webeid/security/authtoken/WebEidAuthToken.java index 5bb777f3..77d80bc4 100644 --- a/src/main/java/eu/webeid/security/authtoken/WebEidAuthToken.java +++ b/src/main/java/eu/webeid/security/authtoken/WebEidAuthToken.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/certificate/CertificateData.java b/src/main/java/eu/webeid/security/certificate/CertificateData.java index aad1ceeb..1c1bb252 100644 --- a/src/main/java/eu/webeid/security/certificate/CertificateData.java +++ b/src/main/java/eu/webeid/security/certificate/CertificateData.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/certificate/CertificateLoader.java b/src/main/java/eu/webeid/security/certificate/CertificateLoader.java index 9c4c9727..0da0a670 100644 --- a/src/main/java/eu/webeid/security/certificate/CertificateLoader.java +++ b/src/main/java/eu/webeid/security/certificate/CertificateLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/certificate/CertificateValidator.java b/src/main/java/eu/webeid/security/certificate/CertificateValidator.java index 3aafd766..93a9e929 100644 --- a/src/main/java/eu/webeid/security/certificate/CertificateValidator.java +++ b/src/main/java/eu/webeid/security/certificate/CertificateValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/certificate/SubjectCertificatePolicies.java b/src/main/java/eu/webeid/security/certificate/SubjectCertificatePolicies.java index da578d5e..19ee8d78 100644 --- a/src/main/java/eu/webeid/security/certificate/SubjectCertificatePolicies.java +++ b/src/main/java/eu/webeid/security/certificate/SubjectCertificatePolicies.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/challenge/ChallengeNonce.java b/src/main/java/eu/webeid/security/challenge/ChallengeNonce.java index b4e92185..23f33222 100644 --- a/src/main/java/eu/webeid/security/challenge/ChallengeNonce.java +++ b/src/main/java/eu/webeid/security/challenge/ChallengeNonce.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/challenge/ChallengeNonceGenerator.java b/src/main/java/eu/webeid/security/challenge/ChallengeNonceGenerator.java index b70f1534..d32d9a86 100644 --- a/src/main/java/eu/webeid/security/challenge/ChallengeNonceGenerator.java +++ b/src/main/java/eu/webeid/security/challenge/ChallengeNonceGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/challenge/ChallengeNonceGeneratorBuilder.java b/src/main/java/eu/webeid/security/challenge/ChallengeNonceGeneratorBuilder.java index 2c843312..11da37b8 100644 --- a/src/main/java/eu/webeid/security/challenge/ChallengeNonceGeneratorBuilder.java +++ b/src/main/java/eu/webeid/security/challenge/ChallengeNonceGeneratorBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/challenge/ChallengeNonceGeneratorImpl.java b/src/main/java/eu/webeid/security/challenge/ChallengeNonceGeneratorImpl.java index 5526cb03..dd80be87 100644 --- a/src/main/java/eu/webeid/security/challenge/ChallengeNonceGeneratorImpl.java +++ b/src/main/java/eu/webeid/security/challenge/ChallengeNonceGeneratorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/challenge/ChallengeNonceStore.java b/src/main/java/eu/webeid/security/challenge/ChallengeNonceStore.java index bdd34efc..2631cf86 100644 --- a/src/main/java/eu/webeid/security/challenge/ChallengeNonceStore.java +++ b/src/main/java/eu/webeid/security/challenge/ChallengeNonceStore.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/AuthTokenException.java b/src/main/java/eu/webeid/security/exceptions/AuthTokenException.java index 9f2e8c72..1e270cb4 100644 --- a/src/main/java/eu/webeid/security/exceptions/AuthTokenException.java +++ b/src/main/java/eu/webeid/security/exceptions/AuthTokenException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/AuthTokenParseException.java b/src/main/java/eu/webeid/security/exceptions/AuthTokenParseException.java index 68508402..810824e6 100644 --- a/src/main/java/eu/webeid/security/exceptions/AuthTokenParseException.java +++ b/src/main/java/eu/webeid/security/exceptions/AuthTokenParseException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/AuthTokenSignatureValidationException.java b/src/main/java/eu/webeid/security/exceptions/AuthTokenSignatureValidationException.java index 066617bd..192b6fd5 100644 --- a/src/main/java/eu/webeid/security/exceptions/AuthTokenSignatureValidationException.java +++ b/src/main/java/eu/webeid/security/exceptions/AuthTokenSignatureValidationException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/CertificateDecodingException.java b/src/main/java/eu/webeid/security/exceptions/CertificateDecodingException.java index 99be6d31..71d5dbe4 100644 --- a/src/main/java/eu/webeid/security/exceptions/CertificateDecodingException.java +++ b/src/main/java/eu/webeid/security/exceptions/CertificateDecodingException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/CertificateExpiredException.java b/src/main/java/eu/webeid/security/exceptions/CertificateExpiredException.java index 4d16c264..ea3de153 100644 --- a/src/main/java/eu/webeid/security/exceptions/CertificateExpiredException.java +++ b/src/main/java/eu/webeid/security/exceptions/CertificateExpiredException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/CertificateNotTrustedException.java b/src/main/java/eu/webeid/security/exceptions/CertificateNotTrustedException.java index ad13b3ff..6d2ac04e 100644 --- a/src/main/java/eu/webeid/security/exceptions/CertificateNotTrustedException.java +++ b/src/main/java/eu/webeid/security/exceptions/CertificateNotTrustedException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/CertificateNotYetValidException.java b/src/main/java/eu/webeid/security/exceptions/CertificateNotYetValidException.java index 7d658bd6..90b967fd 100644 --- a/src/main/java/eu/webeid/security/exceptions/CertificateNotYetValidException.java +++ b/src/main/java/eu/webeid/security/exceptions/CertificateNotYetValidException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/ChallengeNonceExpiredException.java b/src/main/java/eu/webeid/security/exceptions/ChallengeNonceExpiredException.java index 2955d0c6..ca5e23c6 100644 --- a/src/main/java/eu/webeid/security/exceptions/ChallengeNonceExpiredException.java +++ b/src/main/java/eu/webeid/security/exceptions/ChallengeNonceExpiredException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/ChallengeNonceNotFoundException.java b/src/main/java/eu/webeid/security/exceptions/ChallengeNonceNotFoundException.java index 6456307a..a2312123 100644 --- a/src/main/java/eu/webeid/security/exceptions/ChallengeNonceNotFoundException.java +++ b/src/main/java/eu/webeid/security/exceptions/ChallengeNonceNotFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/ChallengeNullOrEmptyException.java b/src/main/java/eu/webeid/security/exceptions/ChallengeNullOrEmptyException.java index 0bf1ba8f..08037248 100644 --- a/src/main/java/eu/webeid/security/exceptions/ChallengeNullOrEmptyException.java +++ b/src/main/java/eu/webeid/security/exceptions/ChallengeNullOrEmptyException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/JceException.java b/src/main/java/eu/webeid/security/exceptions/JceException.java index d597c6a2..b9da794a 100644 --- a/src/main/java/eu/webeid/security/exceptions/JceException.java +++ b/src/main/java/eu/webeid/security/exceptions/JceException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/OCSPCertificateException.java b/src/main/java/eu/webeid/security/exceptions/OCSPCertificateException.java index 5ec050a2..397cf23f 100644 --- a/src/main/java/eu/webeid/security/exceptions/OCSPCertificateException.java +++ b/src/main/java/eu/webeid/security/exceptions/OCSPCertificateException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/UserCertificateDisallowedPolicyException.java b/src/main/java/eu/webeid/security/exceptions/UserCertificateDisallowedPolicyException.java index b5d97255..a25418b8 100644 --- a/src/main/java/eu/webeid/security/exceptions/UserCertificateDisallowedPolicyException.java +++ b/src/main/java/eu/webeid/security/exceptions/UserCertificateDisallowedPolicyException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/UserCertificateMissingPurposeException.java b/src/main/java/eu/webeid/security/exceptions/UserCertificateMissingPurposeException.java index abce3aa1..4e3887e3 100644 --- a/src/main/java/eu/webeid/security/exceptions/UserCertificateMissingPurposeException.java +++ b/src/main/java/eu/webeid/security/exceptions/UserCertificateMissingPurposeException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/UserCertificateOCSPCheckFailedException.java b/src/main/java/eu/webeid/security/exceptions/UserCertificateOCSPCheckFailedException.java index a943f201..5ca68dc5 100644 --- a/src/main/java/eu/webeid/security/exceptions/UserCertificateOCSPCheckFailedException.java +++ b/src/main/java/eu/webeid/security/exceptions/UserCertificateOCSPCheckFailedException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/UserCertificateParseException.java b/src/main/java/eu/webeid/security/exceptions/UserCertificateParseException.java index 6e3c136f..49c43885 100644 --- a/src/main/java/eu/webeid/security/exceptions/UserCertificateParseException.java +++ b/src/main/java/eu/webeid/security/exceptions/UserCertificateParseException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/UserCertificateRevokedException.java b/src/main/java/eu/webeid/security/exceptions/UserCertificateRevokedException.java index 9d451a4d..83eb53ab 100644 --- a/src/main/java/eu/webeid/security/exceptions/UserCertificateRevokedException.java +++ b/src/main/java/eu/webeid/security/exceptions/UserCertificateRevokedException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/exceptions/UserCertificateWrongPurposeException.java b/src/main/java/eu/webeid/security/exceptions/UserCertificateWrongPurposeException.java index 3ef77132..884280b4 100644 --- a/src/main/java/eu/webeid/security/exceptions/UserCertificateWrongPurposeException.java +++ b/src/main/java/eu/webeid/security/exceptions/UserCertificateWrongPurposeException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/util/Base64Decoder.java b/src/main/java/eu/webeid/security/util/Base64Decoder.java index d359eca0..97aa20af 100644 --- a/src/main/java/eu/webeid/security/util/Base64Decoder.java +++ b/src/main/java/eu/webeid/security/util/Base64Decoder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/util/Collections.java b/src/main/java/eu/webeid/security/util/Collections.java index 0ddfe3e1..585cb6c4 100644 --- a/src/main/java/eu/webeid/security/util/Collections.java +++ b/src/main/java/eu/webeid/security/util/Collections.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/util/DateAndTime.java b/src/main/java/eu/webeid/security/util/DateAndTime.java index 5d052cc6..f269df9c 100644 --- a/src/main/java/eu/webeid/security/util/DateAndTime.java +++ b/src/main/java/eu/webeid/security/util/DateAndTime.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/util/Strings.java b/src/main/java/eu/webeid/security/util/Strings.java index 17c60b87..1e37f2e9 100644 --- a/src/main/java/eu/webeid/security/util/Strings.java +++ b/src/main/java/eu/webeid/security/util/Strings.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/AuthTokenSignatureValidator.java b/src/main/java/eu/webeid/security/validator/AuthTokenSignatureValidator.java index 9b87e474..60ecf362 100644 --- a/src/main/java/eu/webeid/security/validator/AuthTokenSignatureValidator.java +++ b/src/main/java/eu/webeid/security/validator/AuthTokenSignatureValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/AuthTokenValidationConfiguration.java b/src/main/java/eu/webeid/security/validator/AuthTokenValidationConfiguration.java index d39cfe51..4fe6774b 100644 --- a/src/main/java/eu/webeid/security/validator/AuthTokenValidationConfiguration.java +++ b/src/main/java/eu/webeid/security/validator/AuthTokenValidationConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/AuthTokenValidator.java b/src/main/java/eu/webeid/security/validator/AuthTokenValidator.java index 22fbcbdc..3476ea41 100644 --- a/src/main/java/eu/webeid/security/validator/AuthTokenValidator.java +++ b/src/main/java/eu/webeid/security/validator/AuthTokenValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/AuthTokenValidatorBuilder.java b/src/main/java/eu/webeid/security/validator/AuthTokenValidatorBuilder.java index 564f41af..14f33dc7 100644 --- a/src/main/java/eu/webeid/security/validator/AuthTokenValidatorBuilder.java +++ b/src/main/java/eu/webeid/security/validator/AuthTokenValidatorBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/AuthTokenValidatorImpl.java b/src/main/java/eu/webeid/security/validator/AuthTokenValidatorImpl.java index f9b58d6b..5083d31c 100644 --- a/src/main/java/eu/webeid/security/validator/AuthTokenValidatorImpl.java +++ b/src/main/java/eu/webeid/security/validator/AuthTokenValidatorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateExpiryValidator.java b/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateExpiryValidator.java index 90e35076..f4544294 100644 --- a/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateExpiryValidator.java +++ b/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateExpiryValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateNotRevokedValidator.java b/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateNotRevokedValidator.java index bb38e486..777b5d93 100644 --- a/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateNotRevokedValidator.java +++ b/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateNotRevokedValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificatePolicyValidator.java b/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificatePolicyValidator.java index e6b84869..8f584c7e 100644 --- a/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificatePolicyValidator.java +++ b/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificatePolicyValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificatePurposeValidator.java b/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificatePurposeValidator.java index 1e220da8..279772f3 100644 --- a/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificatePurposeValidator.java +++ b/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificatePurposeValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateTrustedValidator.java b/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateTrustedValidator.java index 0471d5a6..38ceef79 100644 --- a/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateTrustedValidator.java +++ b/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateTrustedValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateValidator.java b/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateValidator.java index ee1b579c..08eccdf8 100644 --- a/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateValidator.java +++ b/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateValidatorBatch.java b/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateValidatorBatch.java index dd893c94..264135e0 100644 --- a/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateValidatorBatch.java +++ b/src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateValidatorBatch.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/ocsp/Digester.java b/src/main/java/eu/webeid/security/validator/ocsp/Digester.java index 6260c296..e704b384 100644 --- a/src/main/java/eu/webeid/security/validator/ocsp/Digester.java +++ b/src/main/java/eu/webeid/security/validator/ocsp/Digester.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/ocsp/OcspClient.java b/src/main/java/eu/webeid/security/validator/ocsp/OcspClient.java index 1e275b0f..7f2e9477 100644 --- a/src/main/java/eu/webeid/security/validator/ocsp/OcspClient.java +++ b/src/main/java/eu/webeid/security/validator/ocsp/OcspClient.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/ocsp/OcspRequestBuilder.java b/src/main/java/eu/webeid/security/validator/ocsp/OcspRequestBuilder.java index 230bf454..f38145d3 100644 --- a/src/main/java/eu/webeid/security/validator/ocsp/OcspRequestBuilder.java +++ b/src/main/java/eu/webeid/security/validator/ocsp/OcspRequestBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ /* * Copyright 2017 The Netty Project - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * The Netty Project and The Web eID Project license this file to you under the * Apache License, version 2.0 (the "License"); you may not use this file except diff --git a/src/main/java/eu/webeid/security/validator/ocsp/OcspResponseValidator.java b/src/main/java/eu/webeid/security/validator/ocsp/OcspResponseValidator.java index bbdb180b..470149f0 100644 --- a/src/main/java/eu/webeid/security/validator/ocsp/OcspResponseValidator.java +++ b/src/main/java/eu/webeid/security/validator/ocsp/OcspResponseValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/ocsp/OcspServiceProvider.java b/src/main/java/eu/webeid/security/validator/ocsp/OcspServiceProvider.java index c80129d7..5f83c1d9 100644 --- a/src/main/java/eu/webeid/security/validator/ocsp/OcspServiceProvider.java +++ b/src/main/java/eu/webeid/security/validator/ocsp/OcspServiceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/ocsp/OcspUrl.java b/src/main/java/eu/webeid/security/validator/ocsp/OcspUrl.java index fbff637e..07171ada 100644 --- a/src/main/java/eu/webeid/security/validator/ocsp/OcspUrl.java +++ b/src/main/java/eu/webeid/security/validator/ocsp/OcspUrl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/ocsp/OkHttpOcspClient.java b/src/main/java/eu/webeid/security/validator/ocsp/OkHttpOcspClient.java index d4a329cc..7557e08b 100644 --- a/src/main/java/eu/webeid/security/validator/ocsp/OkHttpOcspClient.java +++ b/src/main/java/eu/webeid/security/validator/ocsp/OkHttpOcspClient.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/ocsp/service/AiaOcspService.java b/src/main/java/eu/webeid/security/validator/ocsp/service/AiaOcspService.java index 465e9ff3..46cdfc76 100644 --- a/src/main/java/eu/webeid/security/validator/ocsp/service/AiaOcspService.java +++ b/src/main/java/eu/webeid/security/validator/ocsp/service/AiaOcspService.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/ocsp/service/AiaOcspServiceConfiguration.java b/src/main/java/eu/webeid/security/validator/ocsp/service/AiaOcspServiceConfiguration.java index 9d9326bf..8781e3a5 100644 --- a/src/main/java/eu/webeid/security/validator/ocsp/service/AiaOcspServiceConfiguration.java +++ b/src/main/java/eu/webeid/security/validator/ocsp/service/AiaOcspServiceConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/ocsp/service/DesignatedOcspService.java b/src/main/java/eu/webeid/security/validator/ocsp/service/DesignatedOcspService.java index 499d3289..7b102676 100644 --- a/src/main/java/eu/webeid/security/validator/ocsp/service/DesignatedOcspService.java +++ b/src/main/java/eu/webeid/security/validator/ocsp/service/DesignatedOcspService.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/ocsp/service/DesignatedOcspServiceConfiguration.java b/src/main/java/eu/webeid/security/validator/ocsp/service/DesignatedOcspServiceConfiguration.java index 5eff17ae..0bc03193 100644 --- a/src/main/java/eu/webeid/security/validator/ocsp/service/DesignatedOcspServiceConfiguration.java +++ b/src/main/java/eu/webeid/security/validator/ocsp/service/DesignatedOcspServiceConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/eu/webeid/security/validator/ocsp/service/OcspService.java b/src/main/java/eu/webeid/security/validator/ocsp/service/OcspService.java index 347e83cd..243d8944 100644 --- a/src/main/java/eu/webeid/security/validator/ocsp/service/OcspService.java +++ b/src/main/java/eu/webeid/security/validator/ocsp/service/OcspService.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/certificate/CertificateDataTest.java b/src/test/java/eu/webeid/security/certificate/CertificateDataTest.java index 8375fb21..135f991d 100644 --- a/src/test/java/eu/webeid/security/certificate/CertificateDataTest.java +++ b/src/test/java/eu/webeid/security/certificate/CertificateDataTest.java @@ -1,3 +1,24 @@ +/* + * Copyright (c) 2020-2025 Estonian Information System Authority + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package eu.webeid.security.certificate; import org.junit.jupiter.api.Test; diff --git a/src/test/java/eu/webeid/security/challenge/ChallengeNonceGeneratorTest.java b/src/test/java/eu/webeid/security/challenge/ChallengeNonceGeneratorTest.java index 1610c433..5790e0d2 100644 --- a/src/test/java/eu/webeid/security/challenge/ChallengeNonceGeneratorTest.java +++ b/src/test/java/eu/webeid/security/challenge/ChallengeNonceGeneratorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/challenge/InMemoryChallengeNonceStore.java b/src/test/java/eu/webeid/security/challenge/InMemoryChallengeNonceStore.java index 4e06bd74..c6c2d1d3 100644 --- a/src/test/java/eu/webeid/security/challenge/InMemoryChallengeNonceStore.java +++ b/src/test/java/eu/webeid/security/challenge/InMemoryChallengeNonceStore.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/testutil/AbstractTestWithValidator.java b/src/test/java/eu/webeid/security/testutil/AbstractTestWithValidator.java index 742f2184..e62c30db 100644 --- a/src/test/java/eu/webeid/security/testutil/AbstractTestWithValidator.java +++ b/src/test/java/eu/webeid/security/testutil/AbstractTestWithValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/testutil/AuthTokenValidators.java b/src/test/java/eu/webeid/security/testutil/AuthTokenValidators.java index 1f88eeb3..0f18931c 100644 --- a/src/test/java/eu/webeid/security/testutil/AuthTokenValidators.java +++ b/src/test/java/eu/webeid/security/testutil/AuthTokenValidators.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/testutil/Certificates.java b/src/test/java/eu/webeid/security/testutil/Certificates.java index 8911ed6c..215773b6 100644 --- a/src/test/java/eu/webeid/security/testutil/Certificates.java +++ b/src/test/java/eu/webeid/security/testutil/Certificates.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/testutil/Dates.java b/src/test/java/eu/webeid/security/testutil/Dates.java index d6179c1c..837ad77a 100644 --- a/src/test/java/eu/webeid/security/testutil/Dates.java +++ b/src/test/java/eu/webeid/security/testutil/Dates.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/testutil/OcspServiceMaker.java b/src/test/java/eu/webeid/security/testutil/OcspServiceMaker.java index d0ececa3..2a27614f 100644 --- a/src/test/java/eu/webeid/security/testutil/OcspServiceMaker.java +++ b/src/test/java/eu/webeid/security/testutil/OcspServiceMaker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/validator/AuthTokenAlgorithmTest.java b/src/test/java/eu/webeid/security/validator/AuthTokenAlgorithmTest.java index 06264bff..3f1e6a78 100644 --- a/src/test/java/eu/webeid/security/validator/AuthTokenAlgorithmTest.java +++ b/src/test/java/eu/webeid/security/validator/AuthTokenAlgorithmTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/validator/AuthTokenCertificateTest.java b/src/test/java/eu/webeid/security/validator/AuthTokenCertificateTest.java index e9e8e9a7..04c47ec6 100644 --- a/src/test/java/eu/webeid/security/validator/AuthTokenCertificateTest.java +++ b/src/test/java/eu/webeid/security/validator/AuthTokenCertificateTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/validator/AuthTokenSignatureTest.java b/src/test/java/eu/webeid/security/validator/AuthTokenSignatureTest.java index 8fc00bdd..9d094cd6 100644 --- a/src/test/java/eu/webeid/security/validator/AuthTokenSignatureTest.java +++ b/src/test/java/eu/webeid/security/validator/AuthTokenSignatureTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/validator/AuthTokenSignatureValidatorTest.java b/src/test/java/eu/webeid/security/validator/AuthTokenSignatureValidatorTest.java index 87970f1a..59a4b24a 100644 --- a/src/test/java/eu/webeid/security/validator/AuthTokenSignatureValidatorTest.java +++ b/src/test/java/eu/webeid/security/validator/AuthTokenSignatureValidatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/validator/AuthTokenStructureTest.java b/src/test/java/eu/webeid/security/validator/AuthTokenStructureTest.java index d7107ca5..be79c0cb 100644 --- a/src/test/java/eu/webeid/security/validator/AuthTokenStructureTest.java +++ b/src/test/java/eu/webeid/security/validator/AuthTokenStructureTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/validator/AuthTokenValidatorBuilderTest.java b/src/test/java/eu/webeid/security/validator/AuthTokenValidatorBuilderTest.java index a3dfad4e..ba973445 100644 --- a/src/test/java/eu/webeid/security/validator/AuthTokenValidatorBuilderTest.java +++ b/src/test/java/eu/webeid/security/validator/AuthTokenValidatorBuilderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/validator/certvalidators/SubjectCertificateNotRevokedValidatorTest.java b/src/test/java/eu/webeid/security/validator/certvalidators/SubjectCertificateNotRevokedValidatorTest.java index 0f4efb1e..fc4951ae 100644 --- a/src/test/java/eu/webeid/security/validator/certvalidators/SubjectCertificateNotRevokedValidatorTest.java +++ b/src/test/java/eu/webeid/security/validator/certvalidators/SubjectCertificateNotRevokedValidatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/validator/ocsp/OcspClientOverrideTest.java b/src/test/java/eu/webeid/security/validator/ocsp/OcspClientOverrideTest.java index 102271aa..7059ff53 100644 --- a/src/test/java/eu/webeid/security/validator/ocsp/OcspClientOverrideTest.java +++ b/src/test/java/eu/webeid/security/validator/ocsp/OcspClientOverrideTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/validator/ocsp/OcspResponseValidatorTest.java b/src/test/java/eu/webeid/security/validator/ocsp/OcspResponseValidatorTest.java index 9afa7689..a48d7972 100644 --- a/src/test/java/eu/webeid/security/validator/ocsp/OcspResponseValidatorTest.java +++ b/src/test/java/eu/webeid/security/validator/ocsp/OcspResponseValidatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/validator/ocsp/OcspServiceProviderTest.java b/src/test/java/eu/webeid/security/validator/ocsp/OcspServiceProviderTest.java index 819c9df9..00337fd9 100644 --- a/src/test/java/eu/webeid/security/validator/ocsp/OcspServiceProviderTest.java +++ b/src/test/java/eu/webeid/security/validator/ocsp/OcspServiceProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/test/java/eu/webeid/security/validator/ocsp/OcspUrlTest.java b/src/test/java/eu/webeid/security/validator/ocsp/OcspUrlTest.java index 8bf2eea5..95b5759e 100644 --- a/src/test/java/eu/webeid/security/validator/ocsp/OcspUrlTest.java +++ b/src/test/java/eu/webeid/security/validator/ocsp/OcspUrlTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Estonian Information System Authority + * Copyright (c) 2020-2025 Estonian Information System Authority * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal From 12336a4983e960dcfc86d44535cfe5755d993bcd Mon Sep 17 00:00:00 2001 From: Mart Somermaa Date: Mon, 3 Nov 2025 19:05:23 +0200 Subject: [PATCH 2/7] Backport OCSP nonce encoding and length fix from main WE2-1132 Signed-off-by: Mart Somermaa --- .../validator/ocsp/OcspRequestBuilder.java | 40 +++++++------------ 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/src/main/java/eu/webeid/security/validator/ocsp/OcspRequestBuilder.java b/src/main/java/eu/webeid/security/validator/ocsp/OcspRequestBuilder.java index f38145d3..27ad87f1 100644 --- a/src/main/java/eu/webeid/security/validator/ocsp/OcspRequestBuilder.java +++ b/src/main/java/eu/webeid/security/validator/ocsp/OcspRequestBuilder.java @@ -20,23 +20,6 @@ * SOFTWARE. */ -/* - * Copyright 2017 The Netty Project - * Copyright (c) 2020-2025 Estonian Information System Authority - * - * The Netty Project and The Web eID Project license this file to you under the - * Apache License, version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - package eu.webeid.security.validator.ocsp; import org.bouncycastle.asn1.DEROctetString; @@ -48,17 +31,17 @@ import org.bouncycastle.cert.ocsp.OCSPReq; import org.bouncycastle.cert.ocsp.OCSPReqBuilder; +import java.io.IOException; import java.security.SecureRandom; import java.util.Objects; /** - * This is a simplified version of Bouncy Castle's {@link OCSPReqBuilder}. - * - * @see OCSPReqBuilder + * This is a wrapper around Bouncy Castle's {@link OCSPReqBuilder} that + * adds the OCSP nonce extension to the request if needed. */ public final class OcspRequestBuilder { - private static final SecureRandom GENERATOR = new SecureRandom(); + private static final SecureRandom RANDOM_GENERATOR = new SecureRandom(); private boolean ocspNonceEnabled = true; private CertificateID certificateId; @@ -82,19 +65,24 @@ public OCSPReq build() throws OCSPException { builder.addRequest(Objects.requireNonNull(certificateId, "certificateId")); if (ocspNonceEnabled) { - addNonce(builder); + try { + addNonce(builder); + } catch (IOException e) { + throw new OCSPException("Failed to generate OCSP nonce extension", e); + } } return builder.build(); } - private void addNonce(OCSPReqBuilder builder) { - final byte[] nonce = new byte[8]; - GENERATOR.nextBytes(nonce); + private void addNonce(OCSPReqBuilder builder) throws IOException { + final byte[] nonce = new byte[32]; + RANDOM_GENERATOR.nextBytes(nonce); final Extension[] extensions = new Extension[]{ new Extension(OCSPObjectIdentifiers.id_pkix_ocsp_nonce, false, - new DEROctetString(nonce)) + // Follow OpenSSL OCSP nonce encoding convention and add double octet string header. + new DEROctetString(new DEROctetString(nonce))) }; builder.setRequestExtensions(new Extensions(extensions)); } From c519cacd8a1043220cfe6d7afcc10927db52da51 Mon Sep 17 00:00:00 2001 From: Mart Somermaa Date: Mon, 3 Nov 2025 19:48:35 +0200 Subject: [PATCH 3/7] Backport OCSP update time validation and thread-safety and CA certificate expiration fixes and CertificateData Optional API from main WE2-1132 Signed-off-by: Mart Somermaa --- pom.xml | 16 +- .../security/certificate/CertificateData.java | 21 +- .../certificate/CertificateValidator.java | 21 +- .../eu/webeid/security/util/DateAndTime.java | 8 +- .../AuthTokenValidationConfiguration.java | 26 ++- .../validator/AuthTokenValidatorBuilder.java | 34 +++- .../validator/AuthTokenValidatorImpl.java | 17 +- .../SubjectCertificateExpiryValidator.java | 62 ------ ...SubjectCertificateNotRevokedValidator.java | 39 ++-- .../SubjectCertificateTrustedValidator.java | 18 +- ...igester.java => DigestCalculatorImpl.java} | 44 +---- .../validator/ocsp/OcspResponseValidator.java | 62 +++--- .../security/validator/ocsp/OcspUrl.java | 2 - .../ocsp/service/AiaOcspService.java | 6 +- .../ocsp/service/DesignatedOcspService.java | 4 +- .../validator/ocsp/service/OcspService.java | 2 +- .../certificate/CertificateDataTest.java | 41 +--- .../testutil/AbstractTestWithValidator.java | 12 +- .../testutil/AuthTokenValidators.java | 23 +++ .../testutil/{Dates.java => DateMocker.java} | 41 ++-- .../security/testutil/OcspServiceMaker.java | 14 +- .../validator/AuthTokenCertificateTest.java | 82 +++++--- .../validator/AuthTokenSignatureTest.java | 28 ++- .../AuthTokenSignatureValidatorTest.java | 9 +- .../AuthTokenValidatorBuilderTest.java | 33 +++- ...ectCertificateNotRevokedValidatorTest.java | 182 ++++++++++-------- .../ocsp/OcspResponseValidatorTest.java | 95 ++++++--- 27 files changed, 517 insertions(+), 425 deletions(-) delete mode 100644 src/main/java/eu/webeid/security/validator/certvalidators/SubjectCertificateExpiryValidator.java rename src/main/java/eu/webeid/security/validator/ocsp/{Digester.java => DigestCalculatorImpl.java} (57%) rename src/test/java/eu/webeid/security/testutil/{Dates.java => DateMocker.java} (53%) diff --git a/pom.xml b/pom.xml index b2ba3494..416794f1 100644 --- a/pom.xml +++ b/pom.xml @@ -12,17 +12,17 @@ 3.3.9 - 2.22.2 + 3.5.4 1.8 0.11.5 - 2.13.4.2 + 2.18.5 1.7.36 1.70 4.10.0 - 5.8.2 - 3.23.1 - 4.6.1 - 0.8.5 + 5.12.0 + 3.27.3 + 4.11.0 + 0.8.12 ${project.basedir}/../jacoco-coverage-report/target/site/jacoco-aggregate/jacoco.xml @@ -84,7 +84,7 @@ org.mockito - mockito-core + mockito-inline ${mockito.version} test @@ -129,7 +129,7 @@ -