Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
re6stnet
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Milestones
Merge Requests
4
Merge Requests
4
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
re6stnet
Commits
69c4e60a
Commit
69c4e60a
authored
May 16, 2024
by
Tom Niget
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use cryptography instead of crypto for sign function because of deprecation
parent
5cb423e3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
3 deletions
+15
-3
re6st/x509.py
re6st/x509.py
+15
-3
No files found.
re6st/x509.py
View file @
69c4e60a
# -*- coding: utf-8 -*-
import
calendar
,
hashlib
,
hmac
,
logging
,
os
,
struct
,
subprocess
,
threading
,
time
from
OpenSSL
import
crypto
from
cryptography.hazmat.primitives
import
hashes
from
cryptography.hazmat.primitives.asymmetric
import
padding
from
cryptography.hazmat.primitives.serialization
import
load_pem_private_key
from
.
import
utils
from
.version
import
protocol
...
...
@@ -93,7 +97,9 @@ class Cert:
with
open
(
ca
,
"rb"
)
as
f
:
self
.
ca
=
crypto
.
load_certificate
(
crypto
.
FILETYPE_PEM
,
f
.
read
())
with
open
(
key
,
"rb"
)
as
f
:
self
.
key
=
crypto
.
load_privatekey
(
crypto
.
FILETYPE_PEM
,
f
.
read
())
key_pem
=
f
.
read
()
self
.
key
=
crypto
.
load_privatekey
(
crypto
.
FILETYPE_PEM
,
key_pem
)
self
.
key_crypto
=
load_pem_private_key
(
key_pem
,
password
=
None
)
if
cert
:
with
open
(
cert
)
as
f
:
self
.
cert
=
self
.
loadVerify
(
f
.
read
().
encode
())
...
...
@@ -155,8 +161,14 @@ class Cert:
def
verify
(
self
,
sign
:
bytes
,
data
):
crypto
.
verify
(
self
.
ca
,
sign
,
data
,
'sha512'
)
def
sign
(
self
,
data
)
->
bytes
:
return
crypto
.
sign
(
self
.
key
,
data
,
'sha512'
)
def
sign
(
self
,
data
:
bytes
)
->
bytes
:
assert
isinstance
(
data
,
bytes
)
#return crypto.sign(self.key, data, 'sha512') DEPRECATED
return
self
.
key_crypto
.
sign
(
data
,
padding
.
PKCS1v15
(),
hashes
.
SHA512
()
)
def
decrypt
(
self
,
data
:
bytes
)
->
bytes
:
p
=
openssl
(
'rsautl'
,
'-decrypt'
,
'-inkey'
,
self
.
key_path
)
...
...
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