PDFBOX-5941: isSelfSigned() should not throw an exception

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1923393 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

examples/src/main/java/org/apache/pdfbox/examples/signature/cert/CertificateVerifier.java

@@ -23,9 +23,7 @@
 import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.security.GeneralSecurityException;
-import java.security.InvalidKeyException;
 import java.security.PublicKey;
-import java.security.SignatureException;
 import java.security.cert.CertPathBuilder;
 import java.security.cert.CertPathBuilderException;
 import java.security.cert.CertStore;
@@ -263,10 +261,9 @@ private static void checkRevocationsWithIssuer(X509Certificate cert, X509Certifi
     /**
      * Checks whether given X.509 certificate is self-signed.
      * @param cert The X.509 certificate to check.
-     * @return true if the certificate is self-signed, false if not.
-     * @throws java.security.GeneralSecurityException 
+     * @return true if the certificate is self-signed, false if error or not self-signed.
      */
-    public static boolean isSelfSigned(X509Certificate cert) throws GeneralSecurityException
+    public static boolean isSelfSigned(X509Certificate cert)
     {
         try
         {
@@ -275,7 +272,7 @@ public static boolean isSelfSigned(X509Certificate cert) throws GeneralSecurityE
             cert.verify(key, SecurityProvider.getProvider());
             return true;
         }
-        catch (SignatureException | InvalidKeyException ex)
+        catch (GeneralSecurityException | IllegalArgumentException ex)
         {
             // Invalid signature --> not self-signed
             LOG.debug("Couldn't get signature information - returning false", ex);

examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java

@@ -233,14 +233,7 @@ private void traverseChain(X509Certificate certificate, CertSignatureInformation
             certInfo.crlUrl = CertInformationHelper.getCrlUrlFromExtensionValue(crlExtensionValue);
         }
 
-        try
-        {
-            certInfo.isSelfSigned = CertificateVerifier.isSelfSigned(certificate);
-        }
-        catch (GeneralSecurityException ex)
-        {
-            throw new CertificateProccessingException(ex);
-        }
+        certInfo.isSelfSigned = CertificateVerifier.isSelfSigned(certificate);
         if (maxDepth <= 0 || certInfo.isSelfSigned)
         {
             return;