Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
DuniterPy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
clients
python
DuniterPy
Commits
de855d0a
Commit
de855d0a
authored
6 years ago
by
Vincent Texier
Browse files
Options
Downloads
Plain Diff
Merge branch '71_handle_seedhex' into 'dev'
#71
: handle seedhex See merge request
!54
parents
8bcc1373
36572ae8
No related branches found
No related tags found
1 merge request
!54
#71: handle seedhex
Pipeline
#4416
passed
6 years ago
Stage: github-sync
Stage: build
Stage: test
Stage: release
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
duniterpy/helpers.py
+21
-0
21 additions, 0 deletions
duniterpy/helpers.py
duniterpy/key/signing_key.py
+39
-3
39 additions, 3 deletions
duniterpy/key/signing_key.py
with
60 additions
and
3 deletions
duniterpy/helpers.py
+
21
−
0
View file @
de855d0a
from
typing
import
Union
from
libnacl.encode
import
hex_decode
,
hex_encode
def
ensure_bytes
(
data
:
Union
[
str
,
bytes
])
->
bytes
:
...
...
@@ -39,3 +40,23 @@ def xor_bytes(b1: bytes, b2: bytes) -> bytearray:
for
i1
,
i2
in
zip
(
b1
,
b2
):
result
.
append
(
i1
^
i2
)
return
result
def
convert_seedhex_to_seed
(
seedhex
:
str
)
->
bytes
:
"""
Convert seedhex to seed
:param seedhex: seed coded in hexadecimal base
:rtype bytes:
"""
return
bytes
(
hex_decode
(
seedhex
.
encode
(
"
utf-8
"
)))
def
convert_seed_to_seedhex
(
seed
:
bytes
)
->
str
:
"""
Convert seed to seedhex
:param seed: seed
:rtype str:
"""
return
hex_encode
(
seed
).
decode
(
"
utf-8
"
)
This diff is collapsed.
Click to expand it.
duniterpy/key/signing_key.py
+
39
−
3
View file @
de855d0a
...
...
@@ -12,7 +12,7 @@ from libnacl.utils import load_key
from
pylibscrypt
import
scrypt
from
.base58
import
Base58Encoder
from
..helpers
import
ensure_bytes
,
xor_bytes
from
..helpers
import
ensure_bytes
,
xor_bytes
,
convert_seedhex_to_seed
,
convert_seed_to_seedhex
SEED_LENGTH
=
32
# Length of the key
crypto_sign_BYTES
=
64
...
...
@@ -68,6 +68,42 @@ class SigningKey(libnacl.sign.Signer):
return
cls
(
seed
)
def
save_seedhex_file
(
self
,
path
:
str
)
->
None
:
"""
Save hexadecimal seed file from seed
:param path: Authentication file path
"""
seedhex
=
convert_seed_to_seedhex
(
self
.
seed
)
with
open
(
path
,
'
w
'
)
as
fh
:
fh
.
write
(
seedhex
)
@staticmethod
def
from_seedhex_file
(
path
:
str
)
->
SigningKeyType
:
"""
Return SigningKey instance from Seedhex file
:param str path: Hexadecimal seed file path
"""
with
open
(
path
,
'
r
'
)
as
fh
:
seedhex
=
fh
.
read
()
return
SigningKey
.
from_seedhex
(
seedhex
)
@classmethod
def
from_seedhex
(
cls
:
Type
[
SigningKeyType
],
seedhex
:
str
)
->
SigningKeyType
:
"""
Return SigningKey instance from Seedhex
:param str seedhex: Hexadecimal seed string
"""
regex_seedhex
=
compile
(
"
([0-9a-fA-F]{64})
"
)
match
=
search
(
regex_seedhex
,
seedhex
)
if
not
match
:
raise
Exception
(
'
Error: Bad seed hexadecimal format
'
)
seedhex
=
match
.
groups
()[
0
]
seed
=
convert_seedhex_to_seed
(
seedhex
)
return
cls
(
seed
)
def
save_private_key
(
self
,
path
:
str
)
->
None
:
"""
Save authentication file
...
...
@@ -111,8 +147,8 @@ class SigningKey(libnacl.sign.Signer):
pubsec_content
=
fh
.
read
()
# line patterns
regex_pubkey
=
compile
(
"
pub: ([1-9A-HJ-NP-Za-km-z]
+
)
"
,
MULTILINE
)
regex_signkey
=
compile
(
"
sec: ([1-9A-HJ-NP-Za-km-z]
+
)
"
,
MULTILINE
)
regex_pubkey
=
compile
(
"
pub: ([1-9A-HJ-NP-Za-km-z]
{43,44}
)
"
,
MULTILINE
)
regex_signkey
=
compile
(
"
sec: ([1-9A-HJ-NP-Za-km-z]
{88,90}
)
"
,
MULTILINE
)
# check public key field
match
=
search
(
regex_pubkey
,
pubsec_content
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment