diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/x509/ValidateX509CertificateUsername.java b/services/src/main/java/org/keycloak/authentication/authenticators/x509/ValidateX509CertificateUsername.java index 5e29ee55add..d1c52d9b232 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/x509/ValidateX509CertificateUsername.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/x509/ValidateX509CertificateUsername.java @@ -75,12 +75,12 @@ public class ValidateX509CertificateUsername extends AbstractX509ClientCertifica try { CertificateValidator.CertificateValidatorBuilder builder = certificateValidationParameters(context.getSession(), config); CertificateValidator validator = builder.build(certs); - validator.checkRevocationStatus() - .validateTrust() + validator.validateTrust() + .validateTimestamps() .validateKeyUsage() .validateExtendedKeyUsage() - .validateTimestamps() - .validatePolicy(); + .validatePolicy() + .checkRevocationStatus(); } catch(Exception e) { logger.error(e.getMessage(), e); // TODO use specific locale to load error messages diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/x509/X509ClientCertificateAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/x509/X509ClientCertificateAuthenticator.java index 45641935023..a40c146b8d6 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/x509/X509ClientCertificateAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/x509/X509ClientCertificateAuthenticator.java @@ -90,12 +90,12 @@ public class X509ClientCertificateAuthenticator extends AbstractX509ClientCertif try { CertificateValidator.CertificateValidatorBuilder builder = certificateValidationParameters(context.getSession(), config); CertificateValidator validator = builder.build(certs); - validator.checkRevocationStatus() - .validateTrust() + validator.validateTrust() + .validateTimestamps() .validateKeyUsage() .validateExtendedKeyUsage() .validatePolicy() - .validateTimestamps(); + .checkRevocationStatus(); } catch(Exception e) { logger.error(e.getMessage(), e); // TODO use specific locale to load error messages