Fix provider tests with older OpenSC tools

OpenSC 0.22 ignores --label when listing objects, so filter the output
explicitly before checking generated key IDs. Skip the ambiguity test
when pkcs11-tool reports unsupported Ed25519 imports, while preserving
failures for other import errors.

Reproduced both CI failures with Ubuntu 22.04's OpenSC package and
verified that generation now passes and the ambiguity test skips.
The full local suite passes with 49 tests passed and 5 skipped.

Author: mtrojnar

tests/provider-ambiguous-public-key.softhsm

@@ -30,9 +30,18 @@ fi
 # Import directly: provider generation now assigns IDs even to empty URI IDs.
 import_object() {
 	local type="$1" label="$2" fixture="$3"
+	local status=0
 	"${PKCS11_TOOL}" --module "${MODULE}" --token-label "$token" \
 		--login --pin "${PIN}" --write-object "${srcdir}/$fixture" \
-		--type "$type" --label "$label" "${id_args[@]}"
+		--type "$type" --label "$label" "${id_args[@]}" \
+		>"$outdir/import.log" 2>&1 || status=$?
+	cat "$outdir/import.log"
+	if [[ "$status" -ne 0 ]] && grep -q 'Unsupported key type' "$outdir/import.log"; then
+		echo "Skipping test: pkcs11-tool cannot import Ed25519 keys."
+		rm -rf "$outdir"
+		exit 77
+	fi
+	return "$status"
 }
 
 load_public() {

tests/provider-genpkey.softhsm

@@ -85,9 +85,17 @@ genpkey_with_id()
 	for type in pubkey privkey; do
 		objects=$(${PKCS11_TOOL} --module "${MODULE}" --login --pin "${PIN}" \
 			--list-objects --type "$type" --label "$label") || return 1
-		# OpenSC versions print IDs as hex, colon-separated hex, or
-		# decimal followed by parenthesized hex for short IDs.
-		ids=$(printf '%s\n' "$objects" | awk '/^[[:space:]]*ID:/ {
+		# Older OpenSC versions ignore --label when listing objects.
+		# IDs may be hex, colon-separated hex, or decimal followed by
+		# parenthesized hex for short IDs.
+		ids=$(printf '%s\n' "$objects" | awk -v label="$label" '
+		/^[^[:space:]]/ { matches = 0 }
+		/^[[:space:]]*label:/ {
+			value = $0
+			sub(/^[[:space:]]*label:[[:space:]]*/, "", value)
+			matches = value == label
+		}
+		matches && /^[[:space:]]*ID:/ {
 			id = $3 ~ /^\(0x/ ? $3 : $2
 			sub(/^\(0x/, "", id)
 			gsub(/[:)]/, "", id)