[SB][Library][Fix] HKDF API was renamed according to the Crypto review comment

ipl_ci · ipl_ci · commit 511890f677fc · 2025-05-23T05:43:57.000-07:00
diff --git a/CONST_TIME_EXECUTION_TESTING.md b/CONST_TIME_EXECUTION_TESTING.md
@@ -75,7 +75,7 @@
 |           ippsGFpSqrt             |                                           -                                         |
 |           ippsGFpSub              |                                           -                                         |
 |         ippsGFpSub_PE             |                                           -                                         |
-|        ippsHKDF_expand            | Different hashes: sha1, sha256, sha224, sha384, sha512, sha512-256, sha512-224, sm3 |
+|            ippsHKDF               | Different hashes: sha1, sha256, sha224, sha384, sha512, sha512-256, sha512-224, sm3 |
 |       ippsHMACInit_rmf            | Different hashes: sha1, sha256, sha224, sha384, sha512, sha512-256, sha512-224, sm3 |
 |        ippsRSA_Decrypt            |    Different key types and key length: key type 1, 512 bits; key type 2, 512 bits   |
 |     ippsRSADecrypt_OAEP           |    Different key types and key length: key type 1, 512 bits; key type 2, 512 bits   |
diff --git a/doc/source/hkdf.rst b/doc/source/hkdf.rst
@@ -1,7 +1,7 @@
-.. _hkdf_expand:
+.. _hkdf:
 
 
-HKDF_expand
+HKDF
 ===========
 
 
@@ -13,7 +13,7 @@ Syntax
 ------
 
 
-IppStatus ippsHKDF_expand(const Ipp8u\* ikm, int ikmLen, Ipp8u\* okm,
+IppStatus ippsHKDF(const Ipp8u\* ikm, int ikmLen, Ipp8u\* okm,
 int okmLen, const Ipp8u\* salt, int saltLen, const Ipp8u\* info, int
 infoLen, const IppsHashMethod\* pMethod);
 
diff --git a/doc/source/keyed-hash-functions.rst b/doc/source/keyed-hash-functions.rst
@@ -95,4 +95,4 @@ functions transform it to a position-independent form and vice versa:
    hmac_final
    hmac_gettag
    hmac_message
-   hkdf_expand
+   hkdf
diff --git a/include/ippcp.h b/include/ippcp.h
@@ -630,11 +630,12 @@ IPPAPI(IppStatus, ippsHMACMessage_rmf,(const Ipp8u* pMsg, int msgLen,
                                        Ipp8u* pMD, int mdLen,
                                        const IppsHashMethod* pMethod))
 
-IPPAPI(IppStatus, ippsHKDF_expand,(const Ipp8u* ikm, int ikmLen,
-                                   Ipp8u* okm, int okmLen,
-                                   const Ipp8u* salt, int saltLen,
-                                   const Ipp8u* info, int infoLen,
-                                   const IppsHashMethod* pMethod))
+/* HMAC-based Extract-and-Expand Key Derivation Function (HKDF) */
+IPPAPI(IppStatus, ippsHKDF,(const Ipp8u* ikm, int ikmLen,
+                            Ipp8u* okm, int okmLen,
+                            const Ipp8u* salt, int saltLen,
+                            const Ipp8u* info, int infoLen,
+                            const IppsHashMethod* pMethod))
 
 /*
 // =========================================================
diff --git a/include/ippcp/fips_cert.h b/include/ippcp/fips_cert.h
@@ -239,7 +239,7 @@ enum FIPS_IPPCP_FUNC {
     GFpECESEncrypt_SM2,
     GFpECESDecrypt_SM2,
     GFpECESFinal_SM2,
-    HKDF_expand,
+    HKDF,
     XMSSVerify,
     XMSSKeyGen,
     XMSSSign
diff --git a/sources/ippcp/exports.linux.lib-export b/sources/ippcp/exports.linux.lib-export
@@ -497,7 +497,7 @@ EXTERN (ippsLMSPublicKeyStateGetSize)
 EXTERN (ippsLMSSetPublicKeyState)
 EXTERN (ippsLMSSetSignatureState)
 EXTERN (ippsLMSVerify)
-EXTERN (ippsHKDF_expand)
+EXTERN (ippsHKDF)
 EXTERN (ippsXMSSKeyGenBufferGetSize)
 EXTERN (ippsXMSSSignBufferGetSize)
 EXTERN (ippsXMSSPrivateKeyStateGetSize)
@@ -1008,7 +1008,7 @@ VERSION {
    ippsLMSSetPublicKeyState;
    ippsLMSSetSignatureState;
    ippsLMSVerify;
-   ippsHKDF_expand;
+   ippsHKDF;
    ippsXMSSKeyGenBufferGetSize;
    ippsXMSSSignBufferGetSize;
    ippsXMSSPrivateKeyStateGetSize;
diff --git a/sources/ippcp/exports.linux.selftests-export b/sources/ippcp/exports.linux.selftests-export
@@ -497,7 +497,7 @@ EXTERN (ippsLMSPublicKeyStateGetSize)
 EXTERN (ippsLMSSetPublicKeyState)
 EXTERN (ippsLMSSetSignatureState)
 EXTERN (ippsLMSVerify)
-EXTERN (ippsHKDF_expand)
+EXTERN (ippsHKDF)
 EXTERN (ippsXMSSKeyGenBufferGetSize)
 EXTERN (ippsXMSSSignBufferGetSize)
 EXTERN (ippsXMSSPrivateKeyStateGetSize)
@@ -1067,7 +1067,7 @@ VERSION {
    ippsLMSSetPublicKeyState;
    ippsLMSSetSignatureState;
    ippsLMSVerify;
-   ippsHKDF_expand;
+   ippsHKDF;
    ippsXMSSKeyGenBufferGetSize;
    ippsXMSSSignBufferGetSize;
    ippsXMSSPrivateKeyStateGetSize;
diff --git a/sources/ippcp/ippcp.def b/sources/ippcp/ippcp.def
@@ -499,7 +499,7 @@ ippsLMSPublicKeyStateGetSize
 ippsLMSSetPublicKeyState
 ippsLMSSetSignatureState
 ippsLMSVerify
-ippsHKDF_expand
+ippsHKDF
 ippsXMSSKeyGenBufferGetSize
 ippsXMSSSignBufferGetSize
 ippsXMSSPrivateKeyStateGetSize
diff --git a/sources/ippcp/ippcp_fips_selftests.def b/sources/ippcp/ippcp_fips_selftests.def
@@ -499,7 +499,7 @@ ippsLMSPublicKeyStateGetSize
 ippsLMSSetPublicKeyState
 ippsLMSSetSignatureState
 ippsLMSVerify
-ippsHKDF_expand
+ippsHKDF
 ippsXMSSKeyGenBufferGetSize
 ippsXMSSSignBufferGetSize
 ippsXMSSPrivateKeyStateGetSize
diff --git a/sources/ippcp/pcphkdf.c b/sources/ippcp/pcphkdf.c
@@ -25,7 +25,7 @@
 #define MAX_HKDF_INFO_SIZE (128)
 
 /*F*
-//    Name: ippsHKDF_expand
+//    Name: ippsHKDF
 //
 // Purpose: HMAC-based Extract-and-Expand Key Derivation Function (HKDF).
 //
@@ -52,7 +52,7 @@
 //
 *F*/
 IPPFUN(IppStatus,
-       ippsHKDF_expand,
+       ippsHKDF,
        (const Ipp8u* ikm,
         int ikm_len,
         Ipp8u* okm,
