Skip to content

Commit 63f21f4

Browse files
authored
Merge pull request OpenSC#3673 from dengert/Nitrokey-PIV
Major PIV changes to identification and additional card provided info
2 parents d08a0b9 + 97e3d99 commit 63f21f4

6 files changed

Lines changed: 1260 additions & 1118 deletions

File tree

.clang-format

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
BasedOnStyle: LLVM
23
# defaults from LLVM
34
# BreakBeforeBraces: Attach
@@ -40,3 +41,7 @@ BraceWrapping:
4041
AfterObjCDeclaration: true
4142
AfterUnion: true
4243
AfterFunction: true
44+
45+
---
46+
Language: Json
47+
DisableFormat: true

.github/opensc-piv.conf

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/test-piv.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ java -noverify -cp PivApplet/bin/:jcardsim/target/jcardsim-3.0.5-SNAPSHOT.jar co
4646
PID=$!
4747
sleep 5
4848

49-
# enforce the setting of different PIV type to support EC mechanisms
50-
# which are disabled for the generic ATR mapping to older Yubico devices
51-
export OPENSC_CONF="${PWD}/.github/opensc-piv.conf"
52-
5349
$VALGRIND opensc-tool --card-driver default --send-apdu 80b80000120ba000000308000010000100050000020F0F7f
5450
$VALGRIND opensc-tool -n
5551

@@ -78,6 +74,6 @@ pushd src/tests/p11test/
7874
sleep 5
7975
$VALGRIND ./p11test -v -s 0 -p "$PIN" -o piv.json
8076
popd
81-
diff -u3 src/tests/p11test/piv{_ref,}.json
77+
diff -u3 src/tests/p11test/piv{_ref,}.json
8278

8379
kill -9 $PID

0 commit comments

Comments
 (0)