[xmlsectool] branch main updated: XSTJ-93 - Disallow keystoreProvider with pkcs11Config

[Ian Young]

This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch main
in repository xmlsectool.

View the commit online:
http://git.shibboleth.net/view/?p=xmlsectool.git;a=commit;h=49ebef8ccb2e10fca80d4fe137895f01be9b206b

The following commit(s) were added to refs/heads/main by this push:
     new 49ebef8  XSTJ-93 - Disallow keystoreProvider with pkcs11Config
49ebef8 is described below

commit 49ebef8ccb2e10fca80d4fe137895f01be9b206b
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Tue Mar 4 17:45:30 2025 +0000

    XSTJ-93 - Disallow keystoreProvider with pkcs11Config
    
    https://shibboleth.atlassian.net/browse/XSTJ-93
---
 .../shibboleth/tool/xmlsectool/CommandLineArguments.java  | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/CommandLineArguments.java b/src/main/java/net/shibboleth/tool/xmlsectool/CommandLineArguments.java
index 9d6e497..9ec3bd7 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/CommandLineArguments.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/CommandLineArguments.java
@@ -21,9 +21,6 @@ import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterException;
 
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
-
 /** Command line arguments for the {@link XMLSecTool} command line tool. */
 public class CommandLineArguments {
 
@@ -291,14 +288,6 @@ public class CommandLineArguments {
      */
     public void checkForDeprecations() {
 
-        // --keystoreProvider with --pkcs11Config deprecated in V3.0.0
-        if (getPkcs11Config() != null) {
-            if (getKeystoreProvider() != null) {
-                DeprecationSupport.warn(ObjectType.CLI_OPTION, OPT + KEYSTORE_PROVIDER_ARG,
-                        "now ignored when used with " + OPT + PKCS11_CONFIG_ARG, null);
-            }
-        }
-        
     }
 
     /**
@@ -615,6 +604,10 @@ public class CommandLineArguments {
         if (doVerboseOutput() && doQuietOutput()) {
             errorAndExit("Verbose and quiet output are mutually exclusive");
         }
+
+        if (getPkcs11Config() != null && getKeystoreProvider() != null) {
+            errorAndExit(KEYSTORE_PROVIDER_ARG + " is not permitted with " + PKCS11_CONFIG_ARG);
+        }
     }
 
     // Checkstyle: MethodLength OFF

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.