--- a/jdk/src/java.base/share/classes/sun/security/provider/X509Factory.java	Sun Mar 22 10:27:22 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/provider/X509Factory.java	Mon Mar 23 08:51:51 2015 +0800
@@ -28,6 +28,8 @@
 import java.io.*;
 import java.util.*;
 import java.security.cert.*;
+
+import sun.security.util.Pem;
 import sun.security.x509.X509CertImpl;
 import sun.security.x509.X509CRLImpl;
 import sun.security.pkcs.PKCS7;
@@ -633,7 +635,7 @@
 
             checkHeaderFooter(header.toString(), footer.toString());
 
-            return Base64.getMimeDecoder().decode(new String(data, 0, pos));
+            return Pem.decode(new String(data, 0, pos));
         }
     }