Upgrade to 0.15.1

epel9
Tomas Mraz 10 years ago
parent f247adcc64
commit 123f5e28bd

1
.gitignore vendored

@ -1,2 +1,3 @@
/pyOpenSSL-0.13.1.tar.gz
/pyOpenSSL-0.14.tar.gz
/pyOpenSSL-0.15.1.tar.gz

@ -1,47 +0,0 @@
commit 2923dc0f475e0d1a7893c7ca264c95c75f8ba9dd
Author: Bulat Gaifullin <gaifullinbf@gmail.com>
Date: Sun Sep 21 22:36:48 2014 +0400
added parameter digest to select digest algorithm for CRL
diff --git a/OpenSSL/crypto.py b/OpenSSL/crypto.py
index 313a30a..efa1d91 100644
--- a/OpenSSL/crypto.py
+++ b/OpenSSL/crypto.py
@@ -1707,7 +1707,7 @@ class CRL(object):
_raise_current_error()
- def export(self, cert, key, type=FILETYPE_PEM, days=100):
+ def export(self, cert, key, type=FILETYPE_PEM, days=100, digest="sha1"):
"""
export a CRL as a string
@@ -1721,6 +1721,7 @@ class CRL(object):
:param days: The number of days until the next update of this CRL.
:type days: :py:data:`int`
+ :param digest: The message digest to use
:return: :py:data:`str`
"""
@@ -1731,6 +1732,10 @@ class CRL(object):
if not isinstance(type, int):
raise TypeError("type must be an integer")
+ digest_obj = _lib.EVP_get_digestbyname(_byte_string(digest))
+ if digest_obj == _ffi.NULL:
+ raise ValueError("No such digest method")
+
bio = _lib.BIO_new(_lib.BIO_s_mem())
if bio == _ffi.NULL:
# TODO: This is untested.
@@ -1750,7 +1755,7 @@ class CRL(object):
_lib.X509_CRL_set_issuer_name(self._crl, _lib.X509_get_subject_name(cert._x509))
- sign_result = _lib.X509_CRL_sign(self._crl, key._pkey, _lib.EVP_md5())
+ sign_result = _lib.X509_CRL_sign(self._crl, key._pkey, digest_obj)
if not sign_result:
_raise_current_error()

@ -4,11 +4,9 @@
Summary: Python wrapper module around the OpenSSL library
Name: pyOpenSSL
Version: 0.14
Release: 5%{?dist}
Version: 0.15.1
Release: 1%{?dist}
Source0: http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-%{version}.tar.gz
# The patch is included upstream except we use sha1 by default instead of md5
Patch1: pyOpenSSL-0.14-crl-digest.patch
BuildArch: noarch
License: ASL 2.0
@ -56,8 +54,6 @@ Documentation for pyOpenSSL
%prep
%setup -q -n pyOpenSSL-%{version}
%patch1 -p1 -b .digest
%build
%if 0%{?with_python3}
rm -rf %{py3dir}
@ -100,6 +96,9 @@ popd
%doc examples doc/_build/html
%changelog
* Fri Aug 7 2015 Tomáš Mráz <tmraz@redhat.com> - 0.15.1-1
- Upgrade to 0.15.1
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.14-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

@ -1 +1 @@
8579ff3a1d858858acfba5f046a4ddf7 pyOpenSSL-0.14.tar.gz
f447644afcbd5f0a1f47350fec63a4c6 pyOpenSSL-0.15.1.tar.gz

Loading…
Cancel
Save