diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-06-02 21:03:48 -0700 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-06-02 21:03:48 -0700 |
commit | 8edeb3a214c61b2f5c2abbd8bbb0a51709a1126b (patch) | |
tree | 9b8c5236adb82a3428becc9a2f4d4f67166076db | |
parent | 02219d3e1c9843a3c050090caada0f14e7620688 (diff) | |
parent | 803db0e12258759825eaeb8394d4e57a117436b0 (diff) | |
download | pyopenssl-8edeb3a214c61b2f5c2abbd8bbb0a51709a1126b.tar.gz |
Merge pull request #476 from alex/opaque-the-sigalg
X509 sigalg is now opaque
-rwxr-xr-x | setup.py | 2 | ||||
-rw-r--r-- | src/OpenSSL/crypto.py | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -95,7 +95,7 @@ if __name__ == "__main__": package_dir={"": "src"}, install_requires=[ # Fix cryptographyMinimum in tox.ini when changing this! - "cryptography>=1.3", + "cryptography>=1.3.4", "six>=1.5.2" ], ) diff --git a/src/OpenSSL/crypto.py b/src/OpenSSL/crypto.py index 7e05ca6..21bdadd 100644 --- a/src/OpenSSL/crypto.py +++ b/src/OpenSSL/crypto.py @@ -1083,8 +1083,8 @@ class X509(object): .. versionadded:: 0.13 """ - alg = self._x509.cert_info.signature.algorithm - nid = _lib.OBJ_obj2nid(alg) + algor = _lib.X509_get0_tbs_sigalg(self._x509) + nid = _lib.OBJ_obj2nid(algor.algorithm) if nid == _lib.NID_undef: raise ValueError("Undefined signature algorithm") return _ffi.string(_lib.OBJ_nid2ln(nid)) @@ -1787,7 +1787,7 @@ class Revoked(object): obj = _lib.X509_EXTENSION_get_object(ext) if _lib.OBJ_obj2nid(obj) == _lib.NID_crl_reason: _lib.X509_EXTENSION_free(ext) - _lib.sk_X509_EXTENSION_delete(self._revoked.extensions, i) + _lib.X509_REVOKED_delete_ext(self._revoked, i) break def set_reason(self, reason): |