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

Crypto: Backdate selfsigned cert to allow for clock skew

Browse Source
This commit is contained in:
zzz
2018-02-20 12:27:30 +00:00
parent 12c7871640
commit b77524cfc7
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,8 +44,8 @@ import net.i2p.util.SystemVersion;
* All done programatically, no keytool, no BC libs, no sun classes. * All done programatically, no keytool, no BC libs, no sun classes.
* Ref: RFC 2459 * Ref: RFC 2459
* *
* This is coded to create a cert that matches what comes out of keytool * This is coded to create a cert that is similar to what comes out of keytool,
* exactly, even if I don't understand all of it. * even if I don't understand all of it.
* *
* @since 0.9.25 * @since 0.9.25
*/ */
@ -352,8 +352,9 @@ public final class SelfSignedGenerator {
byte[] serial = cert.getSerialNumber().toByteArray(); byte[] serial = cert.getSerialNumber().toByteArray();
if (serial.length > 255) if (serial.length > 255)
throw new IllegalArgumentException(); throw new IllegalArgumentException();
long now = System.currentTimeMillis(); // backdate to allow for clock skew
long then = now + (validDays * 24L * 60 * 60 * 1000); long now = System.currentTimeMillis() - (24L * 60 * 60 * 1000);
long then = now + ((validDays + 1) * 24L * 60 * 60 * 1000);
// used for CRL time and revocation time // used for CRL time and revocation time
byte[] nowbytes = getDate(now); byte[] nowbytes = getDate(now);
// used for next CRL time // used for next CRL time
@ -443,8 +444,9 @@ public final class SelfSignedGenerator {
byte[] rv = new byte[32]; byte[] rv = new byte[32];
rv[0] = 0x30; rv[0] = 0x30;
rv[1] = 30; rv[1] = 30;
long now = System.currentTimeMillis(); // backdate to allow for clock skew
long then = now + (validDays * 24L * 60 * 60 * 1000); long now = System.currentTimeMillis() - (24L * 60 * 60 * 1000);
long then = now + ((validDays + 1) * 24L * 60 * 60 * 1000);
byte[] nowbytes = getDate(now); byte[] nowbytes = getDate(now);
byte[] thenbytes = getDate(then); byte[] thenbytes = getDate(then);
System.arraycopy(nowbytes, 0, rv, 2, 15); System.arraycopy(nowbytes, 0, rv, 2, 15);
@ -723,6 +725,9 @@ public final class SelfSignedGenerator {
return rv; return rv;
} }
/**
* Note: For CLI testing, use java -jar i2p.jar su3file keygen pubkey.crt keystore.ks commonName
*/
/**** /****
public static void main(String[] args) { public static void main(String[] args) {
try { try {