Changeset 9a11165 for core


Ignore:
Timestamp:
Sep 29, 2018 8:40:20 AM (20 months ago)
Author:
slumlord <slumlord@…>
Branches:
master
Children:
c069f76
Parents:
be4c1af (diff), 3a5f020 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p' (head effa099b40ff593227c59707a33922176dc775b1)

to branch 'i2p.i2p.slumlord' (head 5ddcc0dd19779b78356459bd074f75943d5d42d1)

Location:
core/java/src/net/i2p/crypto
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • core/java/src/net/i2p/crypto/SelfSignedGenerator.java

    rbe4c1af r9a11165  
    234234            throw new GeneralSecurityException("cert error", iae);
    235235        }
    236         X509CRL crl = generateCRL(cert, validDays, 1, sigoid, jpriv);
     236        X509CRL crl = generateCRL(cert, validDays, 1, sigoid, priv);
    237237
    238238        // some simple tests
     
    282282     */
    283283    private static X509CRL generateCRL(X509Certificate cert, int validDays, int crlNum,
    284                                        byte[] sigoid, PrivateKey jpriv) throws GeneralSecurityException {
    285 
    286         SigningPrivateKey priv = SigUtil.fromJavaKey(jpriv);
    287 
     284                                       byte[] sigoid, SigningPrivateKey priv) throws GeneralSecurityException {
    288285        byte[] tbs = genTBSCRL(cert, validDays, crlNum, sigoid);
    289286        int tbslen = tbs.length;
  • core/java/src/net/i2p/crypto/SigUtil.java

    rbe4c1af r9a11165  
    190190            else if (spec.equals(SigType.ECDSA_SHA512_P521.getParams()))
    191191                type = SigType.ECDSA_SHA512_P521;
    192             else
    193                 throw new IllegalArgumentException("Unknown EC type");
     192            else {
     193                // failing on Android (ticket #2296)
     194                throw new IllegalArgumentException("Unknown EC type: " + pk.getClass() + " spec: " + spec.getClass());
     195            }
    194196            return fromJavaKey(k, type);
    195197        }
Note: See TracChangeset for help on using the changeset viewer.