Changeset d6a53cc

Timestamp:

Mar 9, 2019 11:47:03 AM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

5d389c8

Parents:

409207e0

Message:

Data: Consolidate offline key check
i2ptunnel: Prevent registration auth if key offline

Files:

• apps/i2ptunnel/jsp/register.jsp (modified) (1 diff)
• apps/sam/java/src/net/i2p/sam/SAMUtils.java (modified) (2 diffs)
• core/java/src/net/i2p/client/impl/I2PSessionImpl.java (modified) (2 diffs)
• core/java/src/net/i2p/data/PrivateKeyFile.java (modified) (2 diffs)
• core/java/src/net/i2p/data/SigningPrivateKey.java (modified) (1 diff)

apps/i2ptunnel/jsp/register.jsp

@@ -128 +128 @@
            if (spk == null) {
                %><tr><td class="infohelp"><%=intl._t("Destination signing key is not available. Start the tunnel.")%></td></tr><%
+           } else if (spk.isOffline()) {
+               %><tr><td class="infohelp"><%=intl._t("Destination signing key is offline. Use CLI tools on the offline machine.")%></td></tr><%
            } else {
                valid = true;

apps/sam/java/src/net/i2p/sam/SAMUtils.java

@@ -118 +118 @@
             SigningPrivateKey spk = new SigningPrivateKey(dtype);
             spk.readBytes(destKeyStream);
-            if (isOffline(spk)) {
+            if (spk.isOffline()) {
                 // offlineExpiration
                 DataHelper.readLong(destKeyStream, 4);
@@ -140 +140 @@
         return destKeyStream.available() == 0;
     }
-
-    /**
-     *  @since 0.9.39
-     */
-    private static boolean isOffline(SigningPrivateKey spk) {
-        byte[] data = spk.getData();
-        for (int i = 0; i < data.length; i++) {
-            if (data[i] != 0)
-                return false;
-        }
-        return true;
-    }
-
 
     /**

core/java/src/net/i2p/client/impl/I2PSessionImpl.java

@@ -578 +578 @@
         _signingPrivateKey = new SigningPrivateKey(dtype);
         _signingPrivateKey.readBytes(destKeyStream);
-        if (isOffline(_signingPrivateKey)) {
+        if (_signingPrivateKey.isOffline()) {
             _offlineExpiration = DataHelper.readLong(destKeyStream, 4) * 1000;;
             int itype = (int) DataHelper.readLong(destKeyStream, 2);
@@ -592 +592 @@
             _signingPrivateKey.readBytes(destKeyStream);
         }
-    }
-
-    /**
-     *  Constant time
-     *  @since 0.9.38
-     */
-    private static boolean isOffline(SigningPrivateKey spk) {
-        byte b = 0;
-        byte[] data = spk.getData();
-        for (int i = 0; i < data.length; i++) {
-            b |= data[i];
-        }
-        return b == 0;
     }
 

core/java/src/net/i2p/data/PrivateKeyFile.java

@@ -622 +622 @@
 
     /**
-     *  Constant time
-     *  @since 0.9.38
-     */
-    private static boolean isOffline(SigningPrivateKey spk) {
-        byte b = 0;
-        byte[] data = spk.getData();
-        for (int i = 0; i < data.length; i++) {
-            b |= data[i];
-        }
-        return b == 0;
-    }
-
-    /**
      *  Does this session have offline and transient keys?
      *  @since 0.9.38
@@ -647 +634 @@
      */
     public void setOfflineData(long expires, SigningPublicKey transientPub, Signature sig, SigningPrivateKey transientPriv) {
-        if (!isOffline(signingPrivKey)) {
+        if (!signingPrivKey.isOffline()) {
             SigType type = getSigningPrivKey().getType();
             byte[] dbytes = new byte[type.getPrivkeyLen()];

core/java/src/net/i2p/data/SigningPrivateKey.java

@@ -102 +102 @@
 
     /**
+     *  Constant time
+     *  @return true if all zeros
+     *  @since 0.9.39 moved from PrivateKeyFile
+     */
+    public boolean isOffline() {
+        if (_data == null)
+            return true;
+        byte b = 0;
+        for (int i = 0; i < _data.length; i++) {
+            b |= _data[i];
+        }
+        return b == 0;
+    }
+
+    /**
      *  @since 0.9.8
      */