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
79ce5537
Unverified
Commit
79ce5537
authored
Jul 28, 2020
by
6543
Committed by
GitHub
Jul 28, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
signer/storage: fix a badly ordered error check (#21379)
parent
8e7bee9b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
setup.md
cmd/clef/docs/setup.md
+1
-1
faucet.html
cmd/faucet/faucet.html
+1
-1
aes_gcm_storage.go
signer/storage/aes_gcm_storage.go
+3
-3
No files found.
cmd/clef/docs/setup.md
View file @
79ce5537
...
@@ -94,7 +94,7 @@ with minimal requirements.
...
@@ -94,7 +94,7 @@ with minimal requirements.
On the
`client`
qube, we need to create a listener which will receive the request from the Dapp, and proxy it.
On the
`client`
qube, we need to create a listener which will receive the request from the Dapp, and proxy it.
[
qubes-client.py
](
qubes/
client/
qubes-client.py
)
:
[
qubes-client.py
](
qubes/qubes-client.py
)
:
```
python
```
python
...
...
cmd/faucet/faucet.html
View file @
79ce5537
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-lg-8 col-lg-offset-2"
>
<div
class=
"col-lg-8 col-lg-offset-2"
>
<div
class=
"input-group"
>
<div
class=
"input-group"
>
<input
id=
"url"
name=
"url"
type=
"text"
class=
"form-control"
placeholder=
"Social network URL containing your Ethereum address..."
>
<input
id=
"url"
name=
"url"
type=
"text"
class=
"form-control"
placeholder=
"Social network URL containing your Ethereum address..."
/
>
<span
class=
"input-group-btn"
>
<span
class=
"input-group-btn"
>
<button
class=
"btn btn-default dropdown-toggle"
type=
"button"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
Give me Ether
<i
class=
"fa fa-caret-down"
aria-hidden=
"true"
></i></button>
<button
class=
"btn btn-default dropdown-toggle"
type=
"button"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
Give me Ether
<i
class=
"fa fa-caret-down"
aria-hidden=
"true"
></i></button>
<ul
class=
"dropdown-menu dropdown-menu-right"
>
{{range $idx, $amount := .Amounts}}
<ul
class=
"dropdown-menu dropdown-menu-right"
>
{{range $idx, $amount := .Amounts}}
...
...
signer/storage/aes_gcm_storage.go
View file @
79ce5537
...
@@ -151,11 +151,11 @@ func encrypt(key []byte, plaintext []byte, additionalData []byte) ([]byte, []byt
...
@@ -151,11 +151,11 @@ func encrypt(key []byte, plaintext []byte, additionalData []byte) ([]byte, []byt
return
nil
,
nil
,
err
return
nil
,
nil
,
err
}
}
aesgcm
,
err
:=
cipher
.
NewGCM
(
block
)
aesgcm
,
err
:=
cipher
.
NewGCM
(
block
)
nonce
:=
make
([]
byte
,
aesgcm
.
NonceSize
())
if
err
!=
nil
{
if
_
,
err
:=
io
.
ReadFull
(
rand
.
Reader
,
nonce
);
err
!=
nil
{
return
nil
,
nil
,
err
return
nil
,
nil
,
err
}
}
if
err
!=
nil
{
nonce
:=
make
([]
byte
,
aesgcm
.
NonceSize
())
if
_
,
err
:=
io
.
ReadFull
(
rand
.
Reader
,
nonce
);
err
!=
nil
{
return
nil
,
nil
,
err
return
nil
,
nil
,
err
}
}
ciphertext
:=
aesgcm
.
Seal
(
nil
,
nonce
,
plaintext
,
additionalData
)
ciphertext
:=
aesgcm
.
Seal
(
nil
,
nonce
,
plaintext
,
additionalData
)
...
...
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