fix info command crashing if cash applet not installed

This commit is contained in:
Andrea Franz 2020-05-27 15:43:57 +02:00
parent 9c338fee4d
commit 9b07e5e3fe
No known key found for this signature in database
GPG Key ID: 4F0D2F2D9DE7F29D
5 changed files with 47 additions and 3 deletions

View File

@ -1 +1 @@
0.3.2
0.3.3

View File

@ -9,7 +9,7 @@ gp-delete D2760000850101
gp-delete A00000080400010101
gp-delete A00000080400010301
gp-delete A0000008040001
gp-load _assets/keycard_v3.0.cap A0000008040001
gp-load _assets/keycard_v3.0.2.cap A0000008040001
# NDEF applet
gp-install-for-install A0000008040001 A000000804000102 D2760000850101 0024d40f12616e64726f69642e636f6d3a706b67696d2e7374617475732e657468657265756d
# Keycard applet

View File

@ -5,6 +5,7 @@ keycard-pair
keycard-open-secure-channel
keycard-verify-pin {{ session_pin }}
keycard-derive-key m/1/2/3
keycard-sign 0000000000000000000000000000000000000000000000000000000000000000
keycard-unpair {{ session_pairing_index }}

View File

@ -0,0 +1,43 @@
# install
gp-select
gp-open-secure-channel
gp-delete D2760000850101
gp-delete A00000080400010101
gp-delete A00000080400010301
gp-delete A0000008040001
gp-load _assets/keycard_v3.0.2.cap A0000008040001
# NDEF applet
gp-install-for-install A0000008040001 A000000804000102 D2760000850101 0024d40f12616e64726f69642e636f6d3a706b67696d2e7374617475732e657468657265756d
# Keycard applet
gp-install-for-install A0000008040001 A000000804000101 A00000080400010101
# Cash applet
gp-install-for-install A0000008040001 A000000804000103 A00000080400010301
# init
keycard-select
keycard-set-secrets 123456 123456789012 KeycardTest
keycard-init
# generate key
keycard-select
keycard-set-secrets 123456 123456789012 KeycardTest
keycard-pair
keycard-open-secure-channel
keycard-verify-pin {{ session_pin }}
keycard-generate-key
keycard-unpair {{ session_pairing_index }}
# sign
keycard-select
keycard-set-secrets 123456 123456789012 KeycardTest
keycard-pair
keycard-open-secure-channel
keycard-verify-pin {{ session_pin }}
keycard-derive-key m/1/2/3
keycard-sign 0000000000000000000000000000000000000000000000000000000000000000
keycard-unpair {{ session_pairing_index }}

View File

@ -268,7 +268,7 @@ func commandInfo(card *scard.Card) error {
fmt.Printf(" NDEF:%v\n", info.HasNDEFCapability())
fmt.Printf("Cash Applet:\n")
if cashInfo == nil {
if len(cashInfo.PublicKey) == 0 {
fmt.Printf(" Installed: %+v\n", false)
return nil
}