From a9f23ad14029dc7c7177905a4464347236f02e19 Mon Sep 17 00:00:00 2001
From: Juliusz Sosinowicz <juliusz@wolfssl.com>
Date: Fri, 20 Feb 2026 19:06:00 +0100
Subject: [PATCH] Add changes for ntp 4.2.8p18

Depends on https://github.com/wolfSSL/osp/pull/319
---
 .github/workflows/ntp.yml | 2 +-
 src/ssl.c                 | 6 ++++++
 wolfcrypt/src/evp.c       | 8 ++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ntp.yml b/.github/workflows/ntp.yml
index 98beed62918..3f2631c01eb 100644
--- a/.github/workflows/ntp.yml
+++ b/.github/workflows/ntp.yml
@@ -44,7 +44,7 @@ jobs:
       fail-fast: false
       matrix:
         # List of releases to test
-        ref: [ 4.2.8p15, 4.2.8p17 ]
+        ref: [ 4.2.8p15, 4.2.8p17, 4.2.8p18 ]
     name: ${{ matrix.ref }}
     if: github.repository_owner == 'wolfssl'
     runs-on: ubuntu-24.04
diff --git a/src/ssl.c b/src/ssl.c
index aa6b8e85156..10fd73ca600 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -12923,6 +12923,12 @@ const WOLFSSL_ObjectInfo wolfssl_object_info[] = {
     #endif /* WOLFSSL_SHA3 */
     #ifdef WOLFSSL_SM3
         { WC_NID_sm3, SM3h, oidHashType, "SM3", "sm3"},
+    #endif
+    #ifdef WOLFSSL_SHAKE128
+        { WC_NID_shake128, SHAKE128h, oidHashType, "SHAKE128", "shake128"},
+    #endif
+    #ifdef WOLFSSL_SHAKE256
+        { WC_NID_shake256, SHAKE256h, oidHashType, "SHAKE256", "shake256"},
     #endif
         /* oidSigType */
     #ifndef NO_DSA
diff --git a/wolfcrypt/src/evp.c b/wolfcrypt/src/evp.c
index b15c1f5907e..dc14d4fe66f 100644
--- a/wolfcrypt/src/evp.c
+++ b/wolfcrypt/src/evp.c
@@ -11281,6 +11281,14 @@ const WOLFSSL_EVP_MD* wolfSSL_EVP_get_digestbynid(int id)
 #ifdef WOLFSSL_SM3
         case WC_NID_sm3:
             return wolfSSL_EVP_sm3();
+#endif
+#ifdef WOLFSSL_SHAKE128
+        case WC_NID_shake128:
+            return wolfSSL_EVP_shake128();
+#endif
+#ifdef WOLFSSL_SHAKE256
+        case WC_NID_shake256:
+            return wolfSSL_EVP_shake256();
 #endif
         default:
             WOLFSSL_MSG("Bad digest id value");