Skip to content

Fixing issue #798 #907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reaperhulk merged 9 commits into from
Oct 18, 2020
Merged

Fixing issue #798 #907

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9ac2ba1
Fixing issue #798, thanks to @reaperhulk; removing undocumented '%s' …
Apr 6, 2020
afc97fd
Failing in windows
Apr 6, 2020
af8a97b
Revert afc97fdae892642c93288f406308292609f28a7c not intended for this PR
Apr 6, 2020
faae732
Import at the top of the file
Apr 6, 2020
bc9ae8d
Update import order
jalberdi004 Apr 6, 2020
c6f5abc
Merge branch 'master' of git://github.com/pyca/pyopenssl
Jun 19, 2020
cd3e476
Merge branch 'master' of github.com:jalberdi004/pyopenssl
Jun 19, 2020
331f171
Merge remote-tracking branch 'upstream/master'
Oct 17, 2020
6768c7b
reformatted with black
Oct 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/OpenSSL/crypto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import calendar
import datetime

from base64 import b16encode
Expand Down Expand Up @@ -1672,7 +1673,9 @@ def set_time(self, vfy_time):
param = _lib.X509_VERIFY_PARAM_new()
param = _ffi.gc(param, _lib.X509_VERIFY_PARAM_free)

_lib.X509_VERIFY_PARAM_set_time(param, int(vfy_time.strftime("%s")))
_lib.X509_VERIFY_PARAM_set_time(
param, calendar.timegm(vfy_time.timetuple())
)
_openssl_assert(_lib.X509_STORE_set1_param(self._store, param) != 0)

def load_locations(self, cafile, capath=None):
Expand Down