Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
bcf3c52a
Commit
bcf3c52a
authored
Mar 22, 2019
by
Guillaume Ballet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PK derivation has to be supported by the card
parent
2625057f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
11 deletions
+7
-11
wallet.go
accounts/scwallet/wallet.go
+7
-11
No files found.
accounts/scwallet/wallet.go
View file @
bcf3c52a
...
...
@@ -321,10 +321,8 @@ func (w *Wallet) Status() (string, error) {
return
fmt
.
Sprintf
(
"Locked, waiting for PIN (%d attempts left)"
,
status
.
PinRetryCount
),
nil
case
!
status
.
Initialized
:
return
fmt
.
Sprintf
(
"Empty, waiting for initialization"
),
nil
case
status
.
SupportsPKDerivation
:
return
fmt
.
Sprintf
(
"Online, can derive public keys"
),
nil
default
:
return
fmt
.
Sprintf
(
"Online
, cannot derive public keys
"
),
nil
return
fmt
.
Sprintf
(
"Online"
),
nil
}
}
...
...
@@ -844,10 +842,9 @@ func (s *Session) authenticate(pairing smartcardPairing) error {
// walletStatus describes a smartcard wallet's status information.
type
walletStatus
struct
{
PinRetryCount
int
// Number of remaining PIN retries
PukRetryCount
int
// Number of remaining PUK retries
Initialized
bool
// Whether the card has been initialized with a private key
SupportsPKDerivation
bool
// Whether the card supports doing public key derivation itself
PinRetryCount
int
// Number of remaining PIN retries
PukRetryCount
int
// Number of remaining PUK retries
Initialized
bool
// Whether the card has been initialized with a private key
}
// walletStatus fetches the wallet's status from the card.
...
...
@@ -869,10 +866,9 @@ func (s *Session) walletStatus() (*walletStatus, error) {
return
nil
,
fmt
.
Errorf
(
"invalid response tag format"
)
}
status
:=
&
walletStatus
{
PinRetryCount
:
int
(
response
.
Data
[
4
]),
PukRetryCount
:
int
(
response
.
Data
[
7
]),
Initialized
:
(
response
.
Data
[
10
]
==
0xff
),
SupportsPKDerivation
:
true
,
/* Cards that don't aren't supported */
PinRetryCount
:
int
(
response
.
Data
[
4
]),
PukRetryCount
:
int
(
response
.
Data
[
7
]),
Initialized
:
(
response
.
Data
[
10
]
==
0xff
),
}
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment