From 23d24a48b5f68b7fed88d1f28cf0f8785905f4c4 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 21 Jan 2020 21:00:54 +0000 Subject: [PATCH] SU3File: Add date output to CLI Bump -5 for previous Ratchet Elligator2 change --- core/java/src/net/i2p/crypto/SU3File.java | 12 ++++++++++-- history.txt | 10 ++++++++++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/core/java/src/net/i2p/crypto/SU3File.java b/core/java/src/net/i2p/crypto/SU3File.java index ce84e25fc..ca3a9cca3 100644 --- a/core/java/src/net/i2p/crypto/SU3File.java +++ b/core/java/src/net/i2p/crypto/SU3File.java @@ -733,8 +733,16 @@ public class SU3File { String versionString = file.getVersionString(); if (versionString.equals("")) System.out.println("No version string found in file '" + signedFile + "'"); - else - System.out.println("Version: " + versionString); + else { + long ver = 0; + try { + ver = Long.parseLong(versionString); + } catch (NumberFormatException nfe) {} + if (ver > 1000000000L) + System.out.println("Version: " + versionString + " (" + DataHelper.formatTime(ver * 1000) + ')'); + else + System.out.println("Version: " + versionString); + } String signerString = file.getSignerString(); if (signerString.equals("")) System.out.println("No signer string found in file '" + signedFile + "'"); diff --git a/history.txt b/history.txt index 02d4b6717..4d8b2edf8 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,14 @@ +2020-01-21 zzz + * Ratchet: Randomize two high bits of Elligator2 encoding + +2020-01-15 zzz + * i2ptunnel: Fix NPE if no config file + +2020-01-11 zzz + * SSU: Extend timeout for msgs with multiple fragments (ticket #2640) + 2020-01-08 zzz + * i2psnark: Support "preview" HTML5 play for partial files * Jetty 9.2.29.v20191105 * Tomcat 8.5.50 diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index f6e6df3a5..4e28a2c8d 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 4; + public final static long BUILD = 5; /** for example "-test" */ public final static String EXTRA = "";