diff --git a/ojluni/src/main/java/sun/security/util/KeyUtil.java b/ojluni/src/main/java/sun/security/util/KeyUtil.java
index 6664dab..6ca9191 100755
--- a/ojluni/src/main/java/sun/security/util/KeyUtil.java
+++ b/ojluni/src/main/java/sun/security/util/KeyUtil.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright 2016 The Android Open Source Project
  * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -32,6 +33,8 @@
 import java.security.interfaces.ECKey;
 import java.security.interfaces.RSAKey;
 import java.security.interfaces.DSAKey;
+import java.security.interfaces.DSAParams;
+import java.security.spec.ECParameterSpec;
 import java.security.spec.KeySpec;
 import javax.crypto.SecretKey;
 import javax.crypto.interfaces.DHKey;
@@ -81,10 +84,26 @@
             size = pubk.getModulus().bitLength();
         } else if (key instanceof ECKey) {
             ECKey pubk = (ECKey)key;
-            size = pubk.getParams().getOrder().bitLength();
+            ECParameterSpec params = pubk.getParams();
+            // According to RFC 3279 section 2.3.5, EC keys are allowed
+            // to inherit parameters in an X.509 certificate issuer's
+            // key parameters, so the parameters may be null. The parent
+            // key will be rejected if its parameters don't pass, so this
+            // is okay.
+            if (params != null) {
+                size = params.getOrder().bitLength();
+            }
         } else if (key instanceof DSAKey) {
             DSAKey pubk = (DSAKey)key;
-            size = pubk.getParams().getP().bitLength();
+            DSAParams params = pubk.getParams();
+            // According to RFC 3279 section 2.3.2, DSA keys are allowed
+            // to inherit parameters in an X.509 certificate issuer's
+            // key parameters, so the parameters may be null. The parent
+            // key will be rejected if its parameters don't pass, so this
+            // is okay.
+            if (params != null) {
+                size = params.getP().bitLength();
+            }
         } else if (key instanceof DHKey) {
             DHKey pubk = (DHKey)key;
             size = pubk.getParams().getP().bitLength();