Skip to content

Commit 9f8a3a1

Browse files
authored
Merge pull request #157 from Frauschi/pkcs11_pqc_prep
PQC Support preparation
2 parents 0088663 + 1906949 commit 9f8a3a1

23 files changed

+2598
-37
lines changed

.github/workflows/alpine-architecture-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches: [ '*' ]
88

99
env:
10-
WOLFSSL_VERSION: v5.8.0-stable
10+
WOLFSSL_VERSION: v5.8.4-stable
1111

1212
jobs:
1313
alpine-architecture-tests:

.github/workflows/nss-cmsutil-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
env:
1111
NSPR_VERSION: NSPR_4_36_BRANCH
1212
NSS_VERSION: NSS_3_112_RTM
13-
WOLFSSL_VERSION: v5.8.0-stable
13+
WOLFSSL_VERSION: v5.8.4-stable
1414
NSS_DEBUG_PKCS11_MODULE: wolfPKCS11
1515
NSPR_LOG_MODULES: all:5
1616
NSPR_LOG_FILE: /logs/nss.log
@@ -238,10 +238,10 @@ jobs:
238238
239239
# Step 2: Generate user certificate and key pair directly in NSS
240240
echo " Generating user certificate and key pair in NSS database..."
241-
241+
242242
# Create random seed for key generation
243243
dd if=/dev/urandom of=noise.bin bs=20 count=1 2>/dev/null
244-
244+
245245
# Generate certificate request with key pair (creates DER format)
246246
printf '\n\n' | certutil -R -s "CN=Test User,O=NSS Test,C=US" \
247247
-o user-req.der -d /nss-test/nssdb -z noise.bin

.github/workflows/nss-curl-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
env:
1010
NSPR_VERSION: NSPR_4_36_BRANCH
1111
NSS_VERSION: NSS_3_112_RTM
12-
WOLFSSL_VERSION: v5.8.0-stable
12+
WOLFSSL_VERSION: v5.8.4-stable
1313
CURL_VERSION: 8.0.0
1414
NSS_DEBUG_PKCS11_MODULE: "wolfPKCS11"
1515
NSPR_LOG_MODULES: all:5
@@ -51,7 +51,7 @@ jobs:
5151
ca-certificates \
5252
libnss3-tools
5353
sudo rm -rf /var/lib/apt/lists/*
54-
54+
5555
- name: Cache NSPR
5656
id: cache-nspr
5757
uses: actions/cache@v4
@@ -87,7 +87,7 @@ jobs:
8787
run: |
8888
mkdir -p /tmp/src
8989
cd /tmp/src
90-
90+
9191
# Clone official Mozilla NSS with specific tag
9292
hg clone https://hg.mozilla.org/projects/nss -r ${{ env.NSS_VERSION }}
9393
@@ -211,7 +211,7 @@ jobs:
211211
run: |
212212
sudo mkdir -p /etc/pki/nssdb
213213
cd /etc/pki
214-
214+
215215
# Initialize NSS database
216216
sudo certutil -N -d sql:/etc/pki/nssdb --empty-password
217217

.github/workflows/nss-pdfsig-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
env:
1010
NSPR_VERSION: NSPR_4_36_BRANCH
1111
NSS_VERSION: NSS_3_112_RTM
12-
WOLFSSL_VERSION: v5.8.0-stable
12+
WOLFSSL_VERSION: v5.8.4-stable
1313

1414
jobs:
1515
test-nss-pdf-signing:

.github/workflows/nss-pk12util-debian-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
workflow_dispatch:
99

1010
env:
11-
WOLFSSL_VERSION: v5.8.0-stable
11+
WOLFSSL_VERSION: v5.8.2-stable # make deb seems to be broken with v5.8.4-stable
1212
NSS_DEBUG_PKCS11_MODULE: wolfPKCS11
1313
NSPR_LOG_MODULES: all:5
1414
NSPR_LOG_FILE: /logs/nss.log

.github/workflows/nss-pk12util-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
env:
1111
NSPR_VERSION: NSPR_4_36_BRANCH
1212
NSS_VERSION: NSS_3_112_RTM
13-
WOLFSSL_VERSION: v5.8.0-stable
13+
WOLFSSL_VERSION: v5.8.4-stable
1414
NSS_DEBUG_PKCS11_MODULE: wolfPKCS11
1515
NSPR_LOG_MODULES: all:5
1616
NSPR_LOG_FILE: /logs/nss.log

.github/workflows/nss-ssltap-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
env:
1111
NSPR_VERSION: NSPR_4_36_BRANCH
1212
NSS_VERSION: NSS_3_112_RTM
13-
WOLFSSL_VERSION: v5.8.0-stable
13+
WOLFSSL_VERSION: v5.8.4-stable
1414
NSS_DEBUG_PKCS11_MODULE: wolfPKCS11
1515
NSPR_LOG_MODULES: all:5
1616
NSPR_LOG_FILE: /logs/nss.log

.github/workflows/nss.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
env:
1111
NSPR_VERSION: NSPR_4_36_BRANCH
1212
NSS_VERSION: NSS_3_112_RTM
13-
WOLFSSL_VERSION: v5.8.0-stable
13+
WOLFSSL_VERSION: v5.8.4-stable
1414
#NSS_DEBUG_PKCS11_MODULE: wolfPKCS11
1515
#NSPR_LOG_MODULES: all:5
1616
#NSPR_LOG_FILE: /logs/nss.log

.github/workflows/storage-upgrade-test-tpm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches: [ '*' ]
66

77
env:
8-
WOLFSSL_VERSION: v5.8.0-stable
8+
WOLFSSL_VERSION: v5.8.4-stable
99

1010
jobs:
1111
storage-upgrade-test-tpm:

.github/workflows/storage-upgrade-test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches: [ '*' ]
66

77
env:
8-
WOLFSSL_VERSION: v5.8.0-stable
8+
WOLFSSL_VERSION: v5.8.4-stable
99

1010
jobs:
1111
storage-upgrade-test:
@@ -20,7 +20,7 @@ jobs:
2020
# - name: v1.3.0
2121
# ref: v1.3.0-stable
2222
# branch-dir: v1.3.0-stable-branch
23-
23+
2424
steps:
2525
# Checkout the PR branch
2626
- name: Checkout PR branch
@@ -52,7 +52,7 @@ jobs:
5252
repository: wolfssl/wolfssl
5353
path: wolfssl
5454
ref: ${{ env.WOLFSSL_VERSION }}
55-
55+
5656
- name: Build wolfssl
5757
if: steps.cache-wolfssl.outputs.cache-hit != 'true'
5858
working-directory: ./wolfssl
@@ -109,30 +109,30 @@ jobs:
109109
- name: Copy storage files from ${{ matrix.base-ref.name }} to PR
110110
run: |
111111
echo "=== Copying storage files from ${{ matrix.base-ref.name }} to PR branch ==="
112-
112+
113113
# Create directories if they don't exist
114114
mkdir -p pr-branch/store
115-
115+
116116
# Copy store files
117117
if [ -d "${{ matrix.base-ref.branch-dir }}/store" ]; then
118118
cp -rv ${{ matrix.base-ref.branch-dir }}/store/* pr-branch/store/ 2>/dev/null || echo "No files in ${{ matrix.base-ref.branch-dir }}/store/"
119119
fi
120-
120+
121121
echo "=== Storage file copy completed ==="
122122
123123
- name: Test storage format compatibility (${{ matrix.base-ref.name }} → PR)
124124
working-directory: ./pr-branch
125125
run: |
126126
echo "=== Testing storage format compatibility with PR branch ==="
127127
echo "This tests that the PR can read storage files created by ${{ matrix.base-ref.name }} branch"
128-
128+
129129
# List the copied files for verification
130130
echo "Files in store directory:"
131131
ls -la store/* 2>/dev/null || echo "No wp* files in store/"
132-
132+
133133
# Run the tests with the copied storage files
134134
./tests/pkcs11test
135-
135+
136136
echo "=== Storage format upgrade test (${{ matrix.base-ref.name }} → PR) completed successfully ==="
137137
138138
# Upload artifacts for debugging if needed

0 commit comments

Comments
 (0)