mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-17 18:06:59 +02:00
bump(dev-python/cryptography): sync with upstream
This commit is contained in:
David Michael
parent
9bd1d9707a
commit
8994b23886
@ -1,3 +1,3 @@
|
||||
DIST cryptography-1.7.1.tar.gz 420673 BLAKE2B 8c0257187f29173bae610f191f6ae3251e5dd2cfcbe639020d1ea8f94a09bfe4281c9f6b2c85aefc1989c5832eab4db40c226a8a2e12c4dcbf6241555dafa628 SHA512 fb88b0ee9e314526fcdbb6d35da409b7335c7408a69d2350c58379471d2b9d76021010955629cf776d26312f22d4f8aa3f135955a19dfbff9d602176c9bbfd40
|
||||
DIST cryptography-2.0.2.tar.gz 427303 BLAKE2B 53f891c02aa4b82b13a66a4c74bd6db9e8dcdb57bd0bba76648e0c1be710ce1d94c8425ead6d81b240b39c034125ce320757d4b43c56bc7410af11f171cf9a21 SHA512 a71219ff52006a7c8bf1553d0f132c747566c630281ef89aac40c65b193b1f0074fc9cda1de7057c76b452113dfb6188c83baef3ed9c05ff18adbc8b7bba646b
|
||||
DIST cryptography-2.1.4.tar.gz 441557 BLAKE2B 66aa07930ee54469328977e27096e65b7a333b38b71828c71cb7891b489ef7af60f5e5590f67b43d5e63dc2279d9ca1ba036879f3145264f7639d65000958b50 SHA512 f749cb4384badc174a842514e5a4fee2ed01ab9c716799d8d9d5301f6d2d97b6c41deb9e425f48928b639fa34bef8c05529ed7e5b777ef5ca75c244f8fda8fd4
|
||||
DIST cryptography-2.2.2.tar.gz 443822 BLAKE2B d0fbaad78d172f1ba1bfa6edd64d2d5a0eac0853a564fdbb9830dfedc5c53fe1b28d8c1878be85ce38b8cd90a0c2e40e6a209158693a88a7053a80f0481e6302 SHA512 6c1b19cdb870d65abad42523697e9a0bebc7a0025b34f10c4bdd30c313333efd7c41bcb4237a29b3a1b270e3fbade75ccb35df172b055b7c075d619f4d9424c9
|
||||
DIST cryptography-2.3.1.tar.gz 449577 BLAKE2B 66a94f68a6f5c14ff1e3316ea740bda8c34135bc4614a6a36880d4970d54cb72d69374555a6a89dd9a6794e35feed8fc4598ad071cce33b9515da1ada4c38d53 SHA512 384581238b5669dbf31fd1b1385ec2ff9c6d76e2b7612efb15f255e17a11a38474f84668e62ceaa39a146260f46cac743575c0a8ffedc1e40c7b2f90d7cb00b1
|
||||
DIST cryptography-2.3.tar.gz 449464 BLAKE2B 7485c745f9c6512a5efce42181970deff19bd4420e91230d84b070cd77450a6805c56a2e37cda73b45c90ed969c8fdbb866a7cc9e53a6828a1ca6e45befd9de8 SHA512 75e14020da500fdbbd578f004b22ef3237844185329adf59288b29f1b3ee9dd2005a2c4a933fe8609a59d168012a9f687bab0f31ab39ed6ca325198aa9295e52
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Library providing cryptographic recipes and primitives"
|
||||
HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( Apache-2.0 BSD )"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="libressl test"
|
||||
|
||||
RDEPEND="
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl )
|
||||
$(python_gen_cond_dep '>=dev-python/cffi-1.4.1:=[${PYTHON_USEDEP}]' 'python*')
|
||||
$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy{,3})
|
||||
>=dev-python/idna-2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
|
||||
$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
|
||||
virtual/python-ipaddress[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
|
||||
dev-python/hypothesis[${PYTHON_USEDEP}]
|
||||
dev-python/iso8601[${PYTHON_USEDEP}]
|
||||
dev-python/pretend[${PYTHON_USEDEP}]
|
||||
dev-python/pyasn1-modules[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
|
||||
dev-python/pytz[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
|
||||
|
||||
python_test() {
|
||||
distutils_install_for_testing
|
||||
|
||||
py.test -v -v -x || die "Tests fail with ${EPYTHON}"
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
|
||||
inherit distutils-r1 flag-o-matic
|
||||
|
||||
DESCRIPTION="Library providing cryptographic recipes and primitives"
|
||||
HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( Apache-2.0 BSD )"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x86-linux ~x64-macos ~x64-solaris"
|
||||
IUSE="libressl test"
|
||||
|
||||
# the openssl 1.0.2l-r1 needs to be updated again :(
|
||||
# It'd theb be able to go into the || section again
|
||||
#=dev-libs/openssl-1.0.2l-r1:0
|
||||
# the following is the original section, disallowing bindist entirely
|
||||
#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
|
||||
RDEPEND="
|
||||
!libressl? (
|
||||
dev-libs/openssl:0= (
|
||||
|| (
|
||||
dev-libs/openssl:0[-bindist(-)]
|
||||
>=dev-libs/openssl-1.0.2o-r6:0
|
||||
)
|
||||
)
|
||||
)
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
|
||||
$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
|
||||
>=dev-python/idna-2.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
|
||||
virtual/python-ipaddress[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
|
||||
dev-python/hypothesis[${PYTHON_USEDEP}]
|
||||
dev-python/iso8601[${PYTHON_USEDEP}]
|
||||
dev-python/pretend[${PYTHON_USEDEP}]
|
||||
dev-python/pyasn1-modules[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
|
||||
dev-python/pytz[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.1.4-libressl-2.7-x509.patch
|
||||
"${FILESDIR}"/${PN}-2.1.4-libressl-2.7-x509_vfy.patch
|
||||
"${FILESDIR}"/CVE-2018-10903.patch
|
||||
)
|
||||
|
||||
python_configure_all() {
|
||||
append-cflags $(test-flags-CC -pthread)
|
||||
}
|
||||
|
||||
python_test() {
|
||||
py.test -v -v -x || die "Tests fail with ${EPYTHON}"
|
||||
}
|
||||
@ -1,26 +1,37 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
|
||||
inherit distutils-r1 flag-o-matic
|
||||
|
||||
DESCRIPTION="Library providing cryptographic recipes and primitives"
|
||||
HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
|
||||
HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( Apache-2.0 BSD )"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="libressl test"
|
||||
|
||||
# the openssl 1.0.2l-r1 needs to be updated again :(
|
||||
# It'd theb be able to go into the || section again
|
||||
#=dev-libs/openssl-1.0.2l-r1:0
|
||||
# the following is the original section, disallowing bindist entirely
|
||||
#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
|
||||
RDEPEND="
|
||||
!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
|
||||
libressl? ( dev-libs/libressl )
|
||||
$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
|
||||
!libressl? (
|
||||
dev-libs/openssl:0= (
|
||||
|| (
|
||||
dev-libs/openssl:0[-bindist(-)]
|
||||
>=dev-libs/openssl-1.0.2o-r6:0
|
||||
)
|
||||
)
|
||||
)
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
|
||||
>=dev-python/idna-2.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
|
||||
@ -30,6 +41,8 @@ RDEPEND="
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
|
||||
$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
|
||||
$(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
|
||||
test? (
|
||||
~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
|
||||
dev-python/hypothesis[${PYTHON_USEDEP}]
|
||||
@ -42,6 +55,9 @@ DEPEND="${RDEPEND}
|
||||
|
||||
DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
|
||||
|
||||
PATCHES=(
|
||||
)
|
||||
|
||||
python_configure_all() {
|
||||
append-cflags $(test-flags-CC -pthread)
|
||||
}
|
||||
@ -1,28 +1,37 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
|
||||
inherit distutils-r1 flag-o-matic
|
||||
|
||||
DESCRIPTION="Library providing cryptographic recipes and primitives"
|
||||
HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
|
||||
HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( Apache-2.0 BSD )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-solaris"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="libressl test"
|
||||
|
||||
# the openssl 1.0.2l-r1 needs to be updated again :(
|
||||
# It'd theb be able to go into the || section again
|
||||
#=dev-libs/openssl-1.0.2l-r1:0
|
||||
# the following is the original section, disallowing bindist entirely
|
||||
#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
|
||||
RDEPEND="
|
||||
!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)]
|
||||
=dev-libs/openssl-1.0.2l-r1:0
|
||||
>=dev-libs/openssl-1.1.0g-r1:0 ) ) )
|
||||
libressl? ( dev-libs/libressl )
|
||||
$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
|
||||
!libressl? (
|
||||
dev-libs/openssl:0= (
|
||||
|| (
|
||||
dev-libs/openssl:0[-bindist(-)]
|
||||
>=dev-libs/openssl-1.0.2o-r6:0
|
||||
)
|
||||
)
|
||||
)
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
|
||||
>=dev-python/idna-2.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
|
||||
@ -32,6 +41,8 @@ RDEPEND="
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
|
||||
$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
|
||||
$(python_gen_cond_dep '!~dev-python/cffi-1.11.3[${PYTHON_USEDEP}]' 'python*')
|
||||
test? (
|
||||
~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
|
||||
dev-python/hypothesis[${PYTHON_USEDEP}]
|
||||
@ -44,6 +55,9 @@ DEPEND="${RDEPEND}
|
||||
|
||||
DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
|
||||
|
||||
PATCHES=(
|
||||
)
|
||||
|
||||
python_configure_all() {
|
||||
append-cflags $(test-flags-CC -pthread)
|
||||
}
|
||||
76
sdk_container/src/third_party/portage-stable/dev-python/cryptography/files/CVE-2018-10903.patch
vendored
Normal file
76
sdk_container/src/third_party/portage-stable/dev-python/cryptography/files/CVE-2018-10903.patch
vendored
Normal file
@ -0,0 +1,76 @@
|
||||
From 688e0f673bfbf43fa898994326c6877f00ab19ef Mon Sep 17 00:00:00 2001
|
||||
From: Paul Kehrer <paul.l.kehrer@gmail.com>
|
||||
Date: Tue, 17 Jul 2018 10:47:57 +0800
|
||||
Subject: [PATCH] disallow implicit tag truncation with finalize_with_tag
|
||||
|
||||
---
|
||||
docs/hazmat/primitives/symmetric-encryption.rst | 1 +
|
||||
src/cryptography/hazmat/backends/openssl/ciphers.py | 5 +++++
|
||||
src/cryptography/hazmat/primitives/ciphers/modes.py | 1 +
|
||||
tests/hazmat/primitives/test_aes.py | 16 ++++++++++++++++
|
||||
5 files changed, 28 insertions(+)
|
||||
|
||||
diff --git a/docs/hazmat/primitives/symmetric-encryption.rst b/docs/hazmat/primitives/symmetric-encryption.rst
|
||||
index 5ebcca754..5b6000902 100644
|
||||
--- a/docs/hazmat/primitives/symmetric-encryption.rst
|
||||
+++ b/docs/hazmat/primitives/symmetric-encryption.rst
|
||||
@@ -670,6 +670,7 @@ Interfaces
|
||||
:raises ValueError: This is raised when the data provided isn't
|
||||
a multiple of the algorithm's block size, if ``min_tag_length`` is
|
||||
less than 4, or if ``len(tag) < min_tag_length``.
|
||||
+ ``min_tag_length`` is an argument to the ``GCM`` constructor.
|
||||
:raises NotImplementedError: This is raised if the version of the
|
||||
OpenSSL backend used is 1.0.1 or earlier.
|
||||
|
||||
diff --git a/src/cryptography/hazmat/backends/openssl/ciphers.py b/src/cryptography/hazmat/backends/openssl/ciphers.py
|
||||
index 462ffea25..e0ee06ee2 100644
|
||||
--- a/src/cryptography/hazmat/backends/openssl/ciphers.py
|
||||
+++ b/src/cryptography/hazmat/backends/openssl/ciphers.py
|
||||
@@ -199,6 +199,11 @@ def finalize_with_tag(self, tag):
|
||||
"finalize_with_tag requires OpenSSL >= 1.0.2. To use this "
|
||||
"method please update OpenSSL"
|
||||
)
|
||||
+ if len(tag) < self._mode._min_tag_length:
|
||||
+ raise ValueError(
|
||||
+ "Authentication tag must be {0} bytes or longer.".format(
|
||||
+ self._mode._min_tag_length)
|
||||
+ )
|
||||
res = self._backend._lib.EVP_CIPHER_CTX_ctrl(
|
||||
self._ctx, self._backend._lib.EVP_CTRL_AEAD_SET_TAG,
|
||||
len(tag), tag
|
||||
diff --git a/src/cryptography/hazmat/primitives/ciphers/modes.py b/src/cryptography/hazmat/primitives/ciphers/modes.py
|
||||
index 598dfaa4a..543015fef 100644
|
||||
--- a/src/cryptography/hazmat/primitives/ciphers/modes.py
|
||||
+++ b/src/cryptography/hazmat/primitives/ciphers/modes.py
|
||||
@@ -220,6 +220,7 @@ def __init__(self, initialization_vector, tag=None, min_tag_length=16):
|
||||
min_tag_length)
|
||||
)
|
||||
self._tag = tag
|
||||
+ self._min_tag_length = min_tag_length
|
||||
|
||||
tag = utils.read_only_property("_tag")
|
||||
initialization_vector = utils.read_only_property("_initialization_vector")
|
||||
diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py
|
||||
index d6f83ebc2..4ceccf155 100644
|
||||
--- a/tests/hazmat/primitives/test_aes.py
|
||||
+++ b/tests/hazmat/primitives/test_aes.py
|
||||
@@ -439,3 +439,19 @@ def test_gcm_tag_decrypt_finalize(self, backend):
|
||||
decryptor.finalize()
|
||||
else:
|
||||
decryptor.finalize_with_tag(tag)
|
||||
+
|
||||
+ @pytest.mark.supported(
|
||||
+ only_if=lambda backend: (
|
||||
+ not backend._lib.CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 or
|
||||
+ backend._lib.CRYPTOGRAPHY_IS_LIBRESSL
|
||||
+ ),
|
||||
+ skip_message="Not supported on OpenSSL 1.0.1",
|
||||
+ )
|
||||
+ def test_gcm_tag_decrypt_finalize_tag_length(self, backend):
|
||||
+ decryptor = base.Cipher(
|
||||
+ algorithms.AES(b"0" * 16),
|
||||
+ modes.GCM(b"0" * 12),
|
||||
+ backend=backend
|
||||
+ ).decryptor()
|
||||
+ with pytest.raises(ValueError):
|
||||
+ decryptor.finalize_with_tag(b"tagtooshort")
|
||||
@ -0,0 +1,23 @@
|
||||
diff -ur a/src/_cffi_src/openssl/x509.py b/src/_cffi_src/openssl/x509.py
|
||||
--- a/src/_cffi_src/openssl/x509.py 2017-07-27 05:11:29.000000000 +0200
|
||||
+++ b/src/_cffi_src/openssl/x509.py 2018-03-23 10:28:00.387774214 +0100
|
||||
@@ -254,8 +254,7 @@
|
||||
|
||||
const X509_ALGOR *X509_get0_tbs_sigalg(const X509 *);
|
||||
|
||||
-/* in 1.1.0 becomes const ASN1_BIT_STRING, const X509_ALGOR */
|
||||
-void X509_get0_signature(ASN1_BIT_STRING **, X509_ALGOR **, X509 *);
|
||||
+void X509_get0_signature(const ASN1_BIT_STRING **, const X509_ALGOR **, const X509 *);
|
||||
|
||||
long X509_get_version(X509 *);
|
||||
|
||||
@@ -338,7 +337,8 @@
|
||||
CUSTOMIZATIONS = """
|
||||
/* Added in 1.0.2 beta but we need it in all versions now due to the great
|
||||
opaquing. */
|
||||
-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
|
||||
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && \
|
||||
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
|
||||
/* from x509/x_x509.c version 1.0.2 */
|
||||
void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,
|
||||
const X509 *x)
|
||||
@ -0,0 +1,73 @@
|
||||
$OpenBSD: patch-src__cffi_src_openssl_x509_vfy_py,v 1.7 2018/02/22 18:49:16 sthen Exp $
|
||||
|
||||
--- a/src/_cffi_src/openssl/x509_vfy.py
|
||||
+++ b/src/_cffi_src/openssl/x509_vfy.py
|
||||
@@ -204,7 +204,7 @@ int sk_X509_OBJECT_num(Cryptography_STACK_OF_X509_OBJE
|
||||
X509_OBJECT *sk_X509_OBJECT_value(Cryptography_STACK_OF_X509_OBJECT *, int);
|
||||
X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *);
|
||||
Cryptography_STACK_OF_X509_OBJECT *X509_STORE_get0_objects(X509_STORE *);
|
||||
-X509 *X509_OBJECT_get0_X509(X509_OBJECT *);
|
||||
+X509 *X509_OBJECT_get0_X509(const X509_OBJECT *);
|
||||
int X509_OBJECT_get_type(const X509_OBJECT *);
|
||||
|
||||
/* added in 1.1.0 */
|
||||
@@ -220,14 +220,11 @@ static const long Cryptography_HAS_102_VERIFICATION_ER
|
||||
static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1;
|
||||
#else
|
||||
static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 0;
|
||||
+#if LIBRESSL_VERSION_NUMBER >= 0x2070000fL
|
||||
+static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1;
|
||||
+#else
|
||||
static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 0;
|
||||
|
||||
-static const long X509_V_ERR_SUITE_B_INVALID_VERSION = 0;
|
||||
-static const long X509_V_ERR_SUITE_B_INVALID_ALGORITHM = 0;
|
||||
-static const long X509_V_ERR_SUITE_B_INVALID_CURVE = 0;
|
||||
-static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0;
|
||||
-static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0;
|
||||
-static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0;
|
||||
/* These 3 defines are unavailable in LibreSSL 2.5.x, but may be added
|
||||
in the future... */
|
||||
#ifndef X509_V_ERR_HOSTNAME_MISMATCH
|
||||
@@ -240,12 +237,6 @@ static const long X509_V_ERR_EMAIL_MISMATCH = 0;
|
||||
static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0;
|
||||
#endif
|
||||
|
||||
-/* X509_V_FLAG_TRUSTED_FIRST is also new in 1.0.2+, but it is added separately
|
||||
- below because it shows up in some earlier 3rd party OpenSSL packages. */
|
||||
-static const long X509_V_FLAG_SUITEB_128_LOS_ONLY = 0;
|
||||
-static const long X509_V_FLAG_SUITEB_192_LOS = 0;
|
||||
-static const long X509_V_FLAG_SUITEB_128_LOS = 0;
|
||||
-
|
||||
int (*X509_VERIFY_PARAM_set1_host)(X509_VERIFY_PARAM *, const char *,
|
||||
size_t) = NULL;
|
||||
int (*X509_VERIFY_PARAM_set1_email)(X509_VERIFY_PARAM *, const char *,
|
||||
@@ -257,6 +248,19 @@ void (*X509_VERIFY_PARAM_set_hostflags)(X509_VERIFY_PA
|
||||
unsigned int) = NULL;
|
||||
#endif
|
||||
|
||||
+static const long X509_V_ERR_SUITE_B_INVALID_VERSION = 0;
|
||||
+static const long X509_V_ERR_SUITE_B_INVALID_ALGORITHM = 0;
|
||||
+static const long X509_V_ERR_SUITE_B_INVALID_CURVE = 0;
|
||||
+static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0;
|
||||
+static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0;
|
||||
+static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0;
|
||||
+/* X509_V_FLAG_TRUSTED_FIRST is also new in 1.0.2+, but it is added separately
|
||||
+ below because it shows up in some earlier 3rd party OpenSSL packages. */
|
||||
+static const long X509_V_FLAG_SUITEB_128_LOS_ONLY = 0;
|
||||
+static const long X509_V_FLAG_SUITEB_192_LOS = 0;
|
||||
+static const long X509_V_FLAG_SUITEB_128_LOS = 0;
|
||||
+#endif
|
||||
+
|
||||
/* OpenSSL 1.0.2+ or Solaris's backport */
|
||||
#ifdef X509_V_FLAG_PARTIAL_CHAIN
|
||||
static const long Cryptography_HAS_X509_V_FLAG_PARTIAL_CHAIN = 1;
|
||||
@@ -292,7 +296,7 @@ X509 *X509_STORE_CTX_get0_cert(X509_STORE_CTX *ctx)
|
||||
return ctx->cert;
|
||||
}
|
||||
|
||||
-X509 *X509_OBJECT_get0_X509(X509_OBJECT *x) {
|
||||
+X509 *X509_OBJECT_get0_X509(const X509_OBJECT *x) {
|
||||
return x->data.x509;
|
||||
}
|
||||
#endif
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/cryptography-2.2.2-r1
vendored
Normal file
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/cryptography-2.2.2-r1
vendored
Normal file
File diff suppressed because one or more lines are too long
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/cryptography-2.3
vendored
Normal file
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/cryptography-2.3
vendored
Normal file
File diff suppressed because one or more lines are too long
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/cryptography-2.3.1
vendored
Normal file
14
sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-python/cryptography-2.3.1
vendored
Normal file
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user