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
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
Boris Kocherov
re6stnet
Commits
a1f90d18
Commit
a1f90d18
authored
Oct 16, 2019
by
Julien Muchembled
Committed by
Thomas Gambier
Oct 22, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix renewal of expired certificate with recent OpenSSL
/reviewed-on
nexedi/re6stnet!21
parent
1098ba6f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
3 deletions
+9
-3
re6st/x509.py
re6st/x509.py
+9
-3
No files found.
re6st/x509.py
View file @
a1f90d18
...
...
@@ -12,6 +12,9 @@ def networkFromCa(ca):
def
subnetFromCert
(
cert
):
return
cert
.
get_subject
().
CN
def
notBefore
(
cert
):
return
calendar
.
timegm
(
time
.
strptime
(
cert
.
get_notBefore
(),
'%Y%m%d%H%M%SZ'
))
def
notAfter
(
cert
):
return
calendar
.
timegm
(
time
.
strptime
(
cert
.
get_notAfter
(),
'%Y%m%d%H%M%SZ'
))
...
...
@@ -127,9 +130,12 @@ class Cert(object):
raise
VerifyError
(
None
,
None
,
'unable to load certificate'
)
if
type
!=
crypto
.
FILETYPE_PEM
:
cert
=
crypto
.
dump_certificate
(
crypto
.
FILETYPE_PEM
,
r
)
p
=
openssl
(
'verify'
,
'-CAfile'
,
self
.
ca_path
)
args
=
[
'verify'
,
'-CAfile'
,
self
.
ca_path
]
if
not
strict
:
args
+=
'-attime'
,
str
(
notBefore
(
r
))
p
=
openssl
(
*
args
)
out
,
err
=
p
.
communicate
(
cert
)
if
p
.
returncode
or
strict
:
if
1
:
# BBB: Old OpenSSL could return 0 in case of errors.
if
err
is
None
:
# utils.Popen failed with ENOMEM
raise
VerifyError
(
None
,
None
,
"error running openssl, assuming cert is invalid"
)
...
...
@@ -140,7 +146,7 @@ class Cert(object):
if
x
.
startswith
(
'error '
):
x
,
msg
=
x
.
split
(
':'
,
1
)
_
,
code
,
_
,
depth
,
_
=
x
.
split
(
None
,
4
)
raise
VerifyError
(
int
(
code
),
int
(
depth
),
msg
)
raise
VerifyError
(
int
(
code
),
int
(
depth
),
msg
.
strip
()
)
return
r
def
verify
(
self
,
sign
,
data
):
...
...
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