--- a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPublicKey.java	Mon May 13 13:32:38 2019 -0700
+++ b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPublicKey.java	Tue May 14 08:47:13 2019 +0800
@@ -128,9 +128,14 @@
         public String toString() {
             StringBuffer sb = new StringBuffer();
             sb.append(algorithm + "PublicKey [size=").append(keyLength)
-                    .append(" bits, type=").append(getKeyType(handles.hCryptKey))
-                    .append(", container=").append(getContainerName(handles.hCryptProv))
-                    .append("]\n  modulus: ").append(getModulus())
+                    .append(" bits, type=");
+            if (handles.hCryptKey != 0) {
+                sb.append(getKeyType(handles.hCryptKey))
+                        .append(", container=").append(getContainerName(handles.hCryptProv));
+            } else {
+                sb.append("CNG");
+            }
+            sb.append("]\n  modulus: ").append(getModulus())
                     .append("\n  public exponent: ").append(getPublicExponent());
             return sb.toString();
         }