Changeset 5afa32a

Timestamp:

Apr 24, 2019 12:23:35 PM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

baeaa65

Parents:

ca0f127

Message:

Crypto: Catch ProviderException? in KeyStoreUtil? (ticket #2479)

File:

• core/java/src/net/i2p/crypto/KeyStoreUtil.java (modified) (6 diffs)

core/java/src/net/i2p/crypto/KeyStoreUtil.java

@@ -12 +12 @@
 import java.security.MessageDigest;
 import java.security.PrivateKey;
+import java.security.ProviderException;
 import java.security.PublicKey;
 import java.security.cert.Certificate;
@@ -1020 +1021 @@
             char[] keypwchars = keyPW.toCharArray();
             return (PrivateKey) keyStore.getKey(alias, keypwchars);
+        } catch (ProviderException pe) {
+            // PE is unchecked
+            throw new GeneralSecurityException(pe);
         } finally {
             if (fis != null) try { fis.close(); } catch (IOException ioe) {}
@@ -1050 +1054 @@
             Certificate[] certs = keyStore.getCertificateChain(alias);
             CertUtil.exportPrivateKey(pk, certs, out);
+        } catch (ProviderException pe) {
+            // PE is unchecked
+            throw new GeneralSecurityException(pe);
         } finally {
             if (fis != null) try { fis.close(); } catch (IOException ioe) {}
@@ -1102 +1109 @@
             keyStore.store(fos, pwchars);
             return cert;
+        } catch (ProviderException pe) {
+            // PE is unchecked
+            throw new GeneralSecurityException(pe);
         } finally {
             if (fis != null) try { fis.close(); } catch (IOException ioe) {}
@@ -1142 +1152 @@
             keyStore.store(fos, pwchars);
             return alias;
+        } catch (ProviderException pe) {
+            // PE is unchecked
+            throw new GeneralSecurityException(pe);
         } finally {
             if (fos != null) try { fos.close(); } catch (IOException ioe) {}
@@ -1170 +1183 @@
             fos = new SecureFileOutputStream(ks);
             keyStore.store(fos, pwchars);
+        } catch (ProviderException pe) {
+            // PE is unchecked
+            throw new GeneralSecurityException(pe);
         } finally {
             if (fos != null) try { fos.close(); } catch (IOException ioe) {}