Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caucase
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
caucase
Commits
b4cc6236
Commit
b4cc6236
authored
Dec 18, 2018
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cli: Fix key_id used with no-encoding stdout on python2.
parent
05893598
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
caucase/cli.py
caucase/cli.py
+3
-3
No files found.
caucase/cli.py
View file @
b4cc6236
...
@@ -962,11 +962,11 @@ def key_id(argv=None):
...
@@ -962,11 +962,11 @@ def key_id(argv=None):
with
open
(
key_path
,
'rb'
)
as
key_file
:
with
open
(
key_path
,
'rb'
)
as
key_file
:
print
(
print
(
key_path
,
key_path
,
utils
.
toUnicode
(
hexlify
(
hexlify
(
x509
.
SubjectKeyIdentifier
.
from_public_key
(
x509
.
SubjectKeyIdentifier
.
from_public_key
(
utils
.
load_privatekey
(
key_file
.
read
()).
public_key
(),
utils
.
load_privatekey
(
key_file
.
read
()).
public_key
(),
).
digest
,
).
digest
,
)
)
,
),
)
)
for
backup_path
in
args
.
backup
:
for
backup_path
in
args
.
backup
:
print
(
backup_path
)
print
(
backup_path
)
...
@@ -979,4 +979,4 @@ def key_id(argv=None):
...
@@ -979,4 +979,4 @@ def key_id(argv=None):
backup_file
.
read
(
struct
.
calcsize
(
'<I'
)),
backup_file
.
read
(
struct
.
calcsize
(
'<I'
)),
)
)
for
key_entry
in
json
.
loads
(
backup_file
.
read
(
header_len
))[
'key_list'
]:
for
key_entry
in
json
.
loads
(
backup_file
.
read
(
header_len
))[
'key_list'
]:
print
(
b' '
,
key_entry
[
'id'
])
print
(
b' '
,
key_entry
[
'id'
]
.
encode
(
'utf-8'
)
)
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