From bfe052f323111ecf3a40d145a1e68f4772d4b6ee Mon Sep 17 00:00:00 2001
From: Martin Balao <mbalao@redhat.com>
Date: Thu, 12 Dec 2024 01:09:32 -0300
Subject: [PATCH] Fix NPE in assertion.

Co-authored-by: Martin Balao Alonso <mbalao@redhat.com>
Co-authored-by: Francisco Ferrari Bihurriet <fferrari@redhat.com>
---
 .../share/classes/sun/security/pkcs11/P11KDF.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KDF.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KDF.java
index e45fb141bc5fb..9d2963892015d 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KDF.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11KDF.java
@@ -108,7 +108,7 @@ protected byte[] engineDeriveData(AlgorithmParameterSpec derivationSpec)
     private <T> T derive(String alg, AlgorithmParameterSpec derivationSpec,
             Class<T> retType) throws InvalidAlgorithmParameterException {
         SecretKey baseKey;
-        SecretKey salt = null;
+        SecretKey salt = EMPTY_KEY;
         byte[] info = null;
         int outLen;
         boolean isExtract = false, isExpand = false;