Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ Backward-incompatible changes:
- Removed deprecated ``OpenSSL.SSL.Context.set_npn_advertise_callback``, ``OpenSSL.SSL.Context.set_npn_select_callback``, and ``OpenSSL.SSL.Connection.get_next_proto_negotiated``.
- Drop support for Python 3.4
- Drop support for OpenSSL 1.0.1
- Honor time zones in the ``vfy_time`` parameter to ``OpenSSL.crypto.X509Store.set_time()``,
and assume that datetimes without a time zone are in UTC instead of in local time.
`#907 <https://github.com/pyca/pyopenssl/pull/907>`_
`#952 <https://github.com/pyca/pyopenssl/pull/952>`_

Deprecations:
^^^^^^^^^^^^^
Expand Down
10 changes: 8 additions & 2 deletions src/OpenSSL/crypto.py
Original file line number Diff line number Diff line change
Expand Up @@ -1660,21 +1660,27 @@ def set_time(self, vfy_time):

Normally the current time is used.

The verification time can be a ``datetime`` object with or without time
zone information. A time without a time zone is assumed to be in UTC.
To avoid ambiguity, ``vfy_time`` should be a timezone-aware
``datetime`` in the UTC time zone.

.. note::

For example, you can determine if a certificate was valid at a given
time.

.. versionadded:: 17.0.0

:param datetime vfy_time: The verification time to set on this store.
:param vfy_time: The verification time to set on this store.
:type vfy_time: :class:`datetime.datetime`
:return: ``None`` if the verification time was successfully set.
"""
param = _lib.X509_VERIFY_PARAM_new()
param = _ffi.gc(param, _lib.X509_VERIFY_PARAM_free)

_lib.X509_VERIFY_PARAM_set_time(
param, calendar.timegm(vfy_time.timetuple())
param, calendar.timegm(vfy_time.utctimetuple())
)
_openssl_assert(_lib.X509_STORE_set1_param(self._store, param) != 0)

Expand Down