From 4eb4f20ae22a8f6a49cbbcaa6603ee19ed078e8b Mon Sep 17 00:00:00 2001
From: Ben Perez <ben.perez@oracle.com>
Date: Fri, 16 Jun 2023 16:46:54 +0000
Subject: [PATCH] 8308808: SunMSCAPI public keys returns internal key array

Reviewed-by: mullan
---
 .../sun/security/mscapi/CPublicKey.java       | 10 ++--
 .../security/mscapi/EncodingMutability.java   | 48 +++++++++++++++++++
 2 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 test/jdk/sun/security/mscapi/EncodingMutability.java

diff --git a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPublicKey.java b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPublicKey.java
index e3ee8b68d1e..3385b40be56 100644
--- a/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPublicKey.java
+++ b/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CPublicKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,13 +87,13 @@ public abstract class CPublicKey extends CKey implements PublicKey {
             if (encoding == null) {
                 try {
                     encoding = KeyFactory.getInstance("EC").generatePublic(
-                                new ECPublicKeySpec(getW(), getParams()))
-                            .getEncoded();
+                            new ECPublicKeySpec(getW(), getParams()))
+                        .getEncoded();
                 } catch (Exception e) {
                     // ignore
                 }
             }
-            return encoding;
+            return (encoding == null) ? null : encoding.clone();
         }
 
         @Override
@@ -179,7 +179,7 @@ public abstract class CPublicKey extends CKey implements PublicKey {
                     // ignore
                 }
             }
-            return encoding;
+            return (encoding == null) ? null : encoding.clone();
         }
 
         private native byte[] getExponent(byte[] keyBlob) throws KeyException;
diff --git a/test/jdk/sun/security/mscapi/EncodingMutability.java b/test/jdk/sun/security/mscapi/EncodingMutability.java
new file mode 100644
index 00000000000..985c4f41d45
--- /dev/null
+++ b/test/jdk/sun/security/mscapi/EncodingMutability.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.security.KeyPairGenerator;
+import java.security.PublicKey;
+
+/*
+ * @test
+ * @bug 8308808
+ * @requires os.family == "windows"
+ * @modules jdk.crypto.mscapi
+ * @run main EncodingMutability
+ */
+public class EncodingMutability {
+
+    public static void main(String[] args) throws Exception {
+        KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA", "SunMSCAPI");
+        PublicKey publicKey = keyGen.generateKeyPair().getPublic();
+        byte initialByte = publicKey.getEncoded()[0];
+        publicKey.getEncoded()[0] = 0;
+        byte mutatedByte = publicKey.getEncoded()[0];
+
+        if (initialByte != mutatedByte) {
+            System.out.println("Was able to mutate first byte of pubkey from " + initialByte + " to " + mutatedByte);
+            throw new RuntimeException("Pubkey was mutated via getEncoded");
+        }
+    }
+}
\ No newline at end of file