Skip to content

Commit fe70a61

Browse files
committed
Add changes for ntp 4.2.8p18
Depends on wolfSSL/osp#319
1 parent 9e5d03b commit fe70a61

3 files changed

Lines changed: 23 additions & 1 deletion

File tree

.github/workflows/ntp.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,22 @@ jobs:
4444
fail-fast: false
4545
matrix:
4646
# List of releases to test
47-
ref: [ 4.2.8p15, 4.2.8p17 ]
47+
ref: [ 4.2.8p15, 4.2.8p17, 4.2.8p18 ]
4848
name: ${{ matrix.ref }}
4949
if: github.repository_owner == 'wolfssl'
5050
runs-on: ubuntu-24.04
5151
# This should be a safe limit for the tests to run.
5252
timeout-minutes: 10
5353
needs: build_wolfssl
5454
steps:
55+
- name: Install dependencies
56+
run: |
57+
# Don't prompt for anything
58+
export DEBIAN_FRONTEND=noninteractive
59+
sudo apt-get update
60+
# hostap dependencies
61+
sudo apt-get install -y liburcu-dev
62+
5563
- name: Download lib
5664
uses: actions/download-artifact@v4
5765
with:

src/ssl.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12923,6 +12923,12 @@ const WOLFSSL_ObjectInfo wolfssl_object_info[] = {
1292312923
#endif /* WOLFSSL_SHA3 */
1292412924
#ifdef WOLFSSL_SM3
1292512925
{ WC_NID_sm3, SM3h, oidHashType, "SM3", "sm3"},
12926+
#endif
12927+
#ifdef WOLFSSL_SHAKE128
12928+
{ WC_NID_shake128, SHAKE128h, oidHashType, "SHAKE128", "shake128"},
12929+
#endif
12930+
#ifdef WOLFSSL_SHAKE256
12931+
{ WC_NID_shake256, SHAKE256h, oidHashType, "SHAKE256", "shake256"},
1292612932
#endif
1292712933
/* oidSigType */
1292812934
#ifndef NO_DSA

wolfcrypt/src/evp.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11281,6 +11281,14 @@ const WOLFSSL_EVP_MD* wolfSSL_EVP_get_digestbynid(int id)
1128111281
#ifdef WOLFSSL_SM3
1128211282
case WC_NID_sm3:
1128311283
return wolfSSL_EVP_sm3();
11284+
#endif
11285+
#ifdef WOLFSSL_SHAKE128
11286+
case WC_NID_shake128:
11287+
return wolfSSL_EVP_shake128();
11288+
#endif
11289+
#ifdef WOLFSSL_SHAKE256
11290+
case WC_NID_shake256:
11291+
return wolfSSL_EVP_shake256();
1128411292
#endif
1128511293
default:
1128611294
WOLFSSL_MSG("Bad digest id value");

0 commit comments

Comments
 (0)