[utilities COMMIT] in /xmlsectool/trunk: doc/RELEASE-NOTES.txt src/main/java/edu/internet2/middleware/security/XmlSec...

[noreply at shibboleth.net]

Author: iay
Date: Wed Mar 13 05:14:21 2013
New Revision: 352

URL: http://svn.shibboleth.net/view/utilities?rev=352&view=rev
Log:
[XSTJ-19] - pkcs11Config option fails to use indicated keystore provider

Modified:
    xmlsectool/trunk/doc/RELEASE-NOTES.txt
    xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecTool.java

Modified: xmlsectool/trunk/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/utilities/xmlsectool/trunk/doc/RELEASE-NOTES.txt?rev=352&r1=351&r2=352&view=diff
==============================================================================
--- xmlsectool/trunk/doc/RELEASE-NOTES.txt (original)
+++ xmlsectool/trunk/doc/RELEASE-NOTES.txt Wed Mar 13 05:14:21 2013
@@ -5,6 +5,7 @@
 [XSTJ-24] - should not use xmlsec IdResolver class
 [XSTJ-22] - non-zero exit codes from shell script
 [XSTJ-20] - pass JVMOPTS environment variable through xmlsectool.sh
+[XSTJ-19] - pkcs11Config option fails to use indicated keystore provider
 [XSTJ-17] - multiple errors in --help documentation
 [XSTJ-16] - misleading error message on failed schema validation
 [XSTJ-15] - XmlSecTool fails with String index out of range -1

Modified: xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecTool.java
URL: http://svn.shibboleth.net/view/utilities/xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecTool.java?rev=352&r1=351&r2=352&view=diff
==============================================================================
--- xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecTool.java (original)
+++ xmlsectool/trunk/src/main/java/edu/internet2/middleware/security/XmlSecTool.java Wed Mar 13 05:14:21 2013
@@ -867,8 +867,8 @@
         } else if (cli.getPkcs11Config() != null) {
             try {
                 credential =
-                        CredentialHelper.getPKCS11Credential(cli.getKeystore(), cli.getPkcs11Config(), cli.getKey(),
-                                cli.getKeyPassword());
+                        CredentialHelper.getPKCS11Credential(cli.getKeystoreProvider(),
+                                cli.getPkcs11Config(), cli.getKey(), cli.getKeyPassword());
             } catch (IOException e) {
                 log.error("Error accessing PKCS11 store", e);
                 System.exit(RC_IO);