Restore the Java 1.4 source floor in the EC point-decoding exception messages and sync the hex formatting and empty-encoding guard into the jdk1.2 and j2me ECCurve overlays.

Author: dghgit

core/src/main/j2me/org/bouncycastle/math/ec/ECCurve.java

@@ -18,6 +18,7 @@
 import org.bouncycastle.util.BigIntegers;
 import org.bouncycastle.util.Integers;
 import org.bouncycastle.util.Properties;
+import org.bouncycastle.util.Strings;
 
 /**
  * base class for an elliptic curve
@@ -381,6 +382,14 @@ public ECPoint decodePoint(byte[] encoded)
         ECPoint p = null;
         int expectedLength = (this.getFieldSize() + 7) / 8;
 
+        if (encoded == null || encoded.length < 1)
+        {
+            // An empty (or null) encoding must be reported as a malformed encoding, not leak an
+            // ArrayIndexOutOfBoundsException out of the point decoder to every caller that decodes
+            // an untrusted point (EC key parse, ECDH/ECIES/TLS ephemeral points).
+            throw new IllegalArgumentException("Invalid point encoding: empty");
+        }
+
         byte type = encoded[0];
         switch (type)
         {
@@ -446,7 +455,8 @@ public ECPoint decodePoint(byte[] encoded)
             break;
         }
         default:
-            throw new IllegalArgumentException("Invalid point encoding type: 0x" + Integer.toString(type, 16));
+            throw new IllegalArgumentException("Invalid point encoding type: 0x"
+                + Strings.toUpperCase(Integer.toHexString(0x100 | (type & 0xFF)).substring(1)));
         }
 
         if (type != 0x00 && p.isInfinity())

core/src/main/java/org/bouncycastle/crypto/parsers/ECIESPublicKeyParser.java

@@ -9,6 +9,7 @@
 import org.bouncycastle.crypto.params.ECDomainParameters;
 import org.bouncycastle.crypto.params.ECPublicKeyParameters;
 import org.bouncycastle.math.ec.ECCurve;
+import org.bouncycastle.util.Strings;
 import org.bouncycastle.util.io.Streams;
 
 public class ECIESPublicKeyParser
@@ -50,7 +51,7 @@ public AsymmetricKeyParameter readKey(InputStream stream)
 
         default:
             throw new IOException("Sender's public key has invalid point encoding type: 0x"
-                + String.format("%02X", first));
+                + Strings.toUpperCase(Integer.toHexString(0x100 | first).substring(1)));
         }
 
         ECCurve curve = ecParams.getCurve();

core/src/main/java/org/bouncycastle/math/ec/ECCurve.java

@@ -18,6 +18,7 @@
 import org.bouncycastle.util.BigIntegers;
 import org.bouncycastle.util.Integers;
 import org.bouncycastle.util.Properties;
+import org.bouncycastle.util.Strings;
 
 /**
  * base class for an elliptic curve
@@ -467,7 +468,8 @@ public ECPoint decodePoint(byte[] encoded)
             break;
         }
         default:
-            throw new IllegalArgumentException("Invalid point encoding type: 0x" + String.format("%02X", type));
+            throw new IllegalArgumentException("Invalid point encoding type: 0x"
+                + Strings.toUpperCase(Integer.toHexString(0x100 | (type & 0xFF)).substring(1)));
         }
 
         if (type != 0x00 && p.isInfinity())

core/src/main/jdk1.2/org/bouncycastle/math/ec/ECCurve.java

@@ -18,6 +18,7 @@
 import org.bouncycastle.util.BigIntegers;
 import org.bouncycastle.util.Integers;
 import org.bouncycastle.util.Properties;
+import org.bouncycastle.util.Strings;
 
 /**
  * base class for an elliptic curve
@@ -394,6 +395,14 @@ public ECPoint decodePoint(byte[] encoded)
         ECPoint p = null;
         int expectedLength = getFieldElementEncodingLength();
 
+        if (encoded == null || encoded.length < 1)
+        {
+            // An empty (or null) encoding must be reported as a malformed encoding, not leak an
+            // ArrayIndexOutOfBoundsException out of the point decoder to every caller that decodes
+            // an untrusted point (EC key parse, ECDH/ECIES/TLS ephemeral points).
+            throw new IllegalArgumentException("Invalid point encoding: empty");
+        }
+
         byte type = encoded[0];
         switch (type)
         {
@@ -459,7 +468,8 @@ public ECPoint decodePoint(byte[] encoded)
             break;
         }
         default:
-            throw new IllegalArgumentException("Invalid point encoding type: 0x" + Integer.toString(type, 16));
+            throw new IllegalArgumentException("Invalid point encoding type: 0x"
+                + Strings.toUpperCase(Integer.toHexString(0x100 | (type & 0xFF)).substring(1)));
         }
 
         if (type != 0x00 && p.isInfinity())