echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Crypto: Catch ProviderException in KeyStoreUtil (ticket #2479)

Browse Source
This commit is contained in:
zzz
2019-04-24 12:23:35 +00:00
parent ca0f12782b
commit 5afa32a393
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/src/net/i2p/crypto/KeyStoreUtil.java
View File

@ -11,6 +11,7 @@ import java.security.KeyStore;
import java.security.KeyStoreException; import java.security.KeyStoreException;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.PrivateKey; import java.security.PrivateKey;
import java.security.ProviderException;
import java.security.PublicKey; import java.security.PublicKey;
import java.security.cert.Certificate; import java.security.cert.Certificate;
import java.security.cert.CertificateExpiredException; import java.security.cert.CertificateExpiredException;
@ -1019,6 +1020,9 @@ public final class KeyStoreUtil {
keyStore.load(fis, pwchars); keyStore.load(fis, pwchars);
char[] keypwchars = keyPW.toCharArray(); char[] keypwchars = keyPW.toCharArray();
return (PrivateKey) keyStore.getKey(alias, keypwchars); return (PrivateKey) keyStore.getKey(alias, keypwchars);
} catch (ProviderException pe) {
// PE is unchecked
throw new GeneralSecurityException(pe);
} finally { } finally {
if (fis != null) try { fis.close(); } catch (IOException ioe) {} if (fis != null) try { fis.close(); } catch (IOException ioe) {}
} }
@ -1049,6 +1053,9 @@ public final class KeyStoreUtil {
throw new GeneralSecurityException("private key not found: " + alias); throw new GeneralSecurityException("private key not found: " + alias);
Certificate[] certs = keyStore.getCertificateChain(alias); Certificate[] certs = keyStore.getCertificateChain(alias);
CertUtil.exportPrivateKey(pk, certs, out); CertUtil.exportPrivateKey(pk, certs, out);
} catch (ProviderException pe) {
// PE is unchecked
throw new GeneralSecurityException(pe);
} finally { } finally {
if (fis != null) try { fis.close(); } catch (IOException ioe) {} if (fis != null) try { fis.close(); } catch (IOException ioe) {}
} }
@ -1101,6 +1108,9 @@ public final class KeyStoreUtil {
fos = new SecureFileOutputStream(ks); fos = new SecureFileOutputStream(ks);
keyStore.store(fos, pwchars); keyStore.store(fos, pwchars);
return cert; return cert;
} catch (ProviderException pe) {
// PE is unchecked
throw new GeneralSecurityException(pe);
} finally { } finally {
if (fis != null) try { fis.close(); } catch (IOException ioe) {} if (fis != null) try { fis.close(); } catch (IOException ioe) {}
if (fos != null) try { fos.close(); } catch (IOException ioe) {} if (fos != null) try { fos.close(); } catch (IOException ioe) {}
@ -1141,6 +1151,9 @@ public final class KeyStoreUtil {
fos = new SecureFileOutputStream(ks); fos = new SecureFileOutputStream(ks);
keyStore.store(fos, pwchars); keyStore.store(fos, pwchars);
return alias; return alias;
} catch (ProviderException pe) {
// PE is unchecked
throw new GeneralSecurityException(pe);
} finally { } finally {
if (fos != null) try { fos.close(); } catch (IOException ioe) {} if (fos != null) try { fos.close(); } catch (IOException ioe) {}
try { in.close(); } catch (IOException ioe) {} try { in.close(); } catch (IOException ioe) {}
@ -1169,6 +1182,9 @@ public final class KeyStoreUtil {
char[] pwchars = ksPW != null ? ksPW.toCharArray() : null; char[] pwchars = ksPW != null ? ksPW.toCharArray() : null;
fos = new SecureFileOutputStream(ks); fos = new SecureFileOutputStream(ks);
keyStore.store(fos, pwchars); keyStore.store(fos, pwchars);
} catch (ProviderException pe) {
// PE is unchecked
throw new GeneralSecurityException(pe);
} finally { } finally {
if (fos != null) try { fos.close(); } catch (IOException ioe) {} if (fos != null) try { fos.close(); } catch (IOException ioe) {}
} }