fix string en-/decoding

2 files changed, 50 insertions, 6 deletions

diff --git a/src/main/java/org/gnunet/util/Strings.java b/src/main/java/org/gnunet/util/Strings.java
index 8de30ab..1efaecf 100644
--- a/src/main/java/org/gnunet/util/Strings.java
+++ b/src/main/java/org/gnunet/util/Strings.java
@@ -24,7 +24,7 @@ package org.gnunet.util;
  * Common functions on Strings, specific to gnunet-java
  */
 public class Strings {
-    private static final String encTable = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
+    private static final String encTable = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
 
     /**
      * Convert binary data to ASCII encoding.  The ASCII encoding is rather
@@ -170,11 +170,45 @@ public class Strings {
     }
 
     private static int getValue(char a) {
-        if ((a >= '0') && (a <= '9')) {
-            return a - '0';
-        }
-        if ((a >= 'A') && (a <= 'V')) {
-            return (a - 'A' + 10);
+        int dec;
+
+        switch (a)
+        {
+            case 'O':
+            case 'o':
+                a = '0';
+                break;
+            case 'i':
+            case 'I':
+            case 'l':
+            case 'L':
+                a = '1';
+                break;
+                /* also consider U to be V */
+            case 'u':
+            case 'U':
+                a = 'V';
+                break;
+            default:
+                break;
+            }
+            if ((a >= '0') && (a <= '9'))
+                return a - '0';
+            if ((a >= 'a') && (a <= 'z'))
+                a = Character.toUpperCase((char) a);
+                /* return (a - 'a' + 10); */
+            dec = 0;
+            if ((a >= 'A') && (a <= 'Z'))
+            {
+              if ('I' < a)
+                  dec++;
+              if ('L' < a)
+                  dec++;
+              if ('O' < a)
+                  dec++;
+              if ('U' < a)
+                  dec++;
+              return (a - 'A' + 10 - dec);
         }
         return -1;
     }
@@ -183,3 +217,4 @@ public class Strings {
         return stringToData(s, getDecodedDataLength(s.length()));
     }
 }
+
diff --git a/src/test/java/org/gnunet/util/PeerIdentityTest.java b/src/test/java/org/gnunet/util/PeerIdentityTest.java
index ac09813..7dd8c95 100644
--- a/src/test/java/org/gnunet/util/PeerIdentityTest.java
+++ b/src/test/java/org/gnunet/util/PeerIdentityTest.java
@@ -19,5 +19,14 @@ public class PeerIdentityTest {
         Assert.assertArrayEquals(peerIdentity.data, peerIdentity2.data);
     }
 
+    /**
+     * Test that new encoding works (test string from Ilya Migal)
+     */
+    @Test
+    public void test_ilya() {
+        PeerIdentity peerIdentity = PeerIdentity.fromString("NF0QZQSD5JEAXTK701H84YP0D2K0ZRM7GYA7MN2RFBJDJPVVYM90");
+        Assert.assertNotNull(peerIdentity);
+    }
+
 }