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

Utils: Catch ProviderException in SelfSignedGenerator (ticket #2344)

Browse Source
This commit is contained in:
zzz
2018-11-25 15:17:27 +00:00
parent dc8a822b0e
commit 9badfd07bf
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/src/net/i2p/crypto/SelfSignedGenerator.java
View File

@ -7,6 +7,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.math.BigInteger;
import java.security.GeneralSecurityException;
import java.security.ProviderException;
import java.security.MessageDigest;
import java.security.PrivateKey;
import java.security.PublicKey;
@ -142,7 +143,12 @@ public final class SelfSignedGenerator {
SigningPrivateKey priv = (SigningPrivateKey) keys[1];
PublicKey jpub = SigUtil.toJavaKey(pub);
PrivateKey jpriv = SigUtil.toJavaKey(priv);
return generate(jpub, jpriv, priv, type, cname, altNames, ou, o, l, st, c, validDays);
try {
return generate(jpub, jpriv, priv, type, cname, altNames, ou, o, l, st, c, validDays);
} catch (ProviderException pe) {
// PE is unchecked
throw new GeneralSecurityException(pe);
}
}
/**
@ -184,6 +190,7 @@ public final class SelfSignedGenerator {
}
byte[] sigoid = getEncodedOIDSeq(oid);
// ProviderException thrown here
byte[] tbs = genTBS(cname, altNames, ou, o, l, st, c, validDays, sigoid, jpub);
int tbslen = tbs.length;
@ -379,6 +386,7 @@ public final class SelfSignedGenerator {
byte[] validity = getValidity(validDays);
byte[] subject = issuer;
// ProviderException thrown here
byte[] pubbytes = jpub.getEncoded();
byte[] extbytes = getExtensions(pubbytes, cname, altNames);