[xmlsectool] branch master updated: Checkstyle fixes.

[Ian Young]

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

iay pushed a commit to branch master
in repository xmlsectool.

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

The following commit(s) were added to refs/heads/master by this push:
       new  1b33f3e   Checkstyle fixes.
1b33f3e is described below

commit 1b33f3e817ce12b65f313597333feb506e6693ef
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Wed Jun 15 11:46:24 2016 +0100

    Checkstyle fixes.
---
 .../net/shibboleth/tool/xmlsectool/CredentialHelper.java    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/shibboleth/tool/xmlsectool/CredentialHelper.java b/src/main/java/net/shibboleth/tool/xmlsectool/CredentialHelper.java
index 1d474fb..be1458c 100644
--- a/src/main/java/net/shibboleth/tool/xmlsectool/CredentialHelper.java
+++ b/src/main/java/net/shibboleth/tool/xmlsectool/CredentialHelper.java
@@ -57,6 +57,9 @@ public final class CredentialHelper {
      * @param certificateFile path to the certificate file associated with the private key
      * 
      * @return the credentials
+     * 
+     * @throws CertificateException if there is a problem decoding the certificate
+     * @throws KeyException if there is a problem decoding the private key
      */
     protected static BasicX509Credential getFileBasedCredentials(final String keyFile, final String keyPassword,
             final String certificateFile) throws KeyException, CertificateException {
@@ -94,6 +97,9 @@ public final class CredentialHelper {
      * @param keyPassword private key password, may not be null
      * 
      * @return the credentials
+     * 
+     * @throws IOException if there was a problem reading the keystore
+     * @throws GeneralSecurityException if there was a problem 
      */
     protected static BasicX509Credential getKeystoreCredential(final String keystorePath,
             final String keystorePassword, final String keystoreProvider, final String keystoreType,
@@ -131,6 +137,9 @@ public final class CredentialHelper {
      * @param keyPassword private key password, may not be null
      * 
      * @return the credentials
+     * 
+     * @throws IOException if it is not possible to read the keystore
+     * @throws GeneralSecurityException if there is a problem loading the keystore, or loading the credential from it
      */
     @SuppressWarnings("unchecked")
     protected static BasicX509Credential getPKCS11Credential(final String keystoreProvider, final String pkcs11Config,
@@ -178,8 +187,10 @@ public final class CredentialHelper {
      * @param keyPassword private key password
      * 
      * @return the extracted credential
+     * 
+     * @throws GeneralSecurityException if there is a problem getting the credential from the keystore,
+     *      or if the credential is not of a known type 
      */
-    @SuppressWarnings("unchecked")
     protected static BasicX509Credential getCredentialFromKeystore(final KeyStore keystore, final String keyAlias,
             final String keyPassword) throws GeneralSecurityException {
 

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