From cff75eb60628827541ea6c08eb1970401f606ebc Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 3 Jun 2025 08:14:05 +0000
Subject: [PATCH] 8358316: PKCS8Key.getEncoded() can throw NPE after
 JDK-8298420

Reviewed-by: ascarpino
---
 src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java b/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java
index 5aa859c58e3..b7cc5e7057f 100644
--- a/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java
+++ b/src/java.base/share/classes/sun/security/pkcs/PKCS8Key.java
@@ -256,7 +256,8 @@ public class PKCS8Key implements PrivateKey, InternalPrivateKey {
      * or {@code null} if an encoding error occurs.
      */
     public byte[] getEncoded() {
-        return getEncodedInternal().clone();
+        byte[] b = getEncodedInternal();
+        return (b != null) ? b.clone() : null;
     }
 
     /**