# HG changeset patch
# User vinnie
# Date 1299781284 0
# Node ID d8a2b71afa0ccaa55fba589b22cb5fdc1a48e4ab
# Parent  e088a9afb9cc578ed7f259256b9c810154520281
7016078: javax.net.ssl.SSLException: Received fatal alert: internal_error starting JDK 7 b126
Reviewed-by: valeriep

diff -r e088a9afb9cc -r d8a2b71afa0c jdk/src/share/classes/sun/security/pkcs11/P11Key.java
--- a/jdk/src/share/classes/sun/security/pkcs11/P11Key.java	Thu Mar 10 12:52:24 2011 +0530
+++ b/jdk/src/share/classes/sun/security/pkcs11/P11Key.java	Thu Mar 10 18:21:24 2011 +0000
@@ -999,18 +999,34 @@
                 new CK_ATTRIBUTE(CKA_EC_PARAMS),
             };
             fetchAttributes(attributes);
+
             try {
                 params = P11ECKeyFactory.decodeParameters
                             (attributes[1].getByteArray());
-                DerValue wECPoint = new DerValue(attributes[0].getByteArray());
-                if (wECPoint.getTag() != DerValue.tag_OctetString)
-                    throw new IOException("Unexpected tag: " +
-                        wECPoint.getTag());
-                params = P11ECKeyFactory.decodeParameters
-                            (attributes[1].getByteArray());
-                w = P11ECKeyFactory.decodePoint
-                    (wECPoint.getDataBytes(), params.getCurve());
+
+                /*
+                 * An uncompressed EC point may be in either of two formats.
+                 * First try the OCTET STRING encoding:
+                 *   04 <length> 04 <X-coordinate> <Y-coordinate>
+                 *
+                 * Otherwise try the raw encoding:
+                 *   04 <X-coordinate> <Y-coordinate>
+                 */
+                byte[] ecKey = attributes[0].getByteArray();
 
+                try {
+                    DerValue wECPoint = new DerValue(ecKey);
+                    if (wECPoint.getTag() != DerValue.tag_OctetString)
+                        throw new IOException("Unexpected tag: " +
+                            wECPoint.getTag());
+
+                    w = P11ECKeyFactory.decodePoint
+                        (wECPoint.getDataBytes(), params.getCurve());
+
+                } catch (IOException e) {
+                    // Failover
+                    w = P11ECKeyFactory.decodePoint(ecKey, params.getCurve());
+                }
 
             } catch (Exception e) {
                 throw new RuntimeException("Could not parse key values", e);