Adding metadata

3 files changed, 112 insertions, 5 deletions

diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 2178be803dcc..6bf9071c9760 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -13,7 +13,7 @@ DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5
 DIST cryptography-3.3.2.tar.gz 539883 BLAKE2B e35de90362b24170c4025f67914e60c16fbf37fce6bcd5d6f3fe32e5a9bb60de8edbebcb1ff0450fabc9c244d4b1a4618c720b630f28c747fea17e9bf008f01f SHA512 55f6ee13342b3209b1fcb310f4c4d33d22856ee785cb2347e6ad36c34e9b42f6e0d5bece8e458b09663a5b78e34c4567fe7a211b51ca71f55ccc93e3f62dc5e4
 DIST cryptography-3.4.8.tar.gz 35746288 BLAKE2B 750a265a5b518fdc992bf8a402792ff849129286751185f931ea82ebf4c9d3dabfed680ec2eb1c73d4c773ef2feac6186e251365921fbc67044b89bc040d311e SHA512 4007cb3a4312bd8053491741474309e9f39c21fe37e66b6a832ae837cf2e9330b71caa9bfc6d6692764336684c26809cb794521800b7f6dadce4367a588117ff
 DIST cryptography-3fd9d5a8424eef3e08260a622ae3644777ac5339.tar.gz 35828220 BLAKE2B 46fd713e51061e51fdd9767caac8cad17e95c4f3491586b2e454f2ea5e9ae0cf89b857c1a4d8d7e6caaff21d0907da655b6fc1e8789d790f55fe15bab30d70b0 SHA512 d0802cae1c3134942e444d79471376588cca24b2cb18e8684b2ed6dc4ab4607079215df048913d3aa895ac65ea612eb1b2604f695d0539c778f696a1409e331b
-DIST cryptography-5d21990c32d0f93df4e54ef4ee7ff3a2dae3c3da.tar.gz 35828292 BLAKE2B 6ad06308300a5ec5c61d62814cf39721de1d47efcb0c9c18951723f6342119f31263df0e23052ae02e9538d7613a93ea3c60f66e39606ef0e30d876656896dce SHA512 3932ad6a372860fd03a335818a610af8bc2568e63d51e9862acc19fc2a552c20f802c738bd13d3aa1594d79ced2b0471c35adacef6bc4b2cc3098af5196b0e33
+DIST cryptography-df06889f348d7c3b7e9c35e4e5a1b1480f0b2c5a.tar.gz 35823566 BLAKE2B 31e6720761672e36548d47a5b2ba1f1a1a2032c5400655868be3d5575ef6d3b0e87a7f13607c9ffe69a8b240952e8a5ae8c440b2c850fcf9a29b057e2222f1a5 SHA512 158c0238e61d9bba927a5edfd55db741bec88e51873816391816c33f92309d29d6e34580c98419bb0b42be5cd122892696b8e08a452a4f056ead7402c831f51d
 DIST cryptography_vectors-3.3.2.tar.gz 35168168 BLAKE2B 3991a16556ae5be0d153cfe302dd9a860918a80bd0bdef7104f3c170ba63941c4b1ff74750bc12329422a6061161cb6452bea60e191d85c0d79e0852566c6c0b SHA512 18590adb96a6f04b8a41d4346b126b8adfc854cbcec85f8c1c0a23b1b363f215b37da60ea94a481b8fd7752f07fba515b08fc18faf2e29fb858e133129971f7c
 DIST ctor-0.1.20.crate 9328 BLAKE2B bc2f4ce53f6b7d6a2fb441317a3f91b8852c541261f95f0b7d12adb35ec1c943810242ce71e514445479c5d225b735cd50fa4dfb514e6b121be753555ab3c30c SHA512 877f4663f8079a368d198a3351e98551c6d8123dd5e53b812529b77b09f1c08296e6df817d7429e4c70a73a6203fd98bce5ec2ce7b09baabe4f348bd54a9c0dd
 DIST ghost-0.1.2.crate 12777 BLAKE2B 34293c1ec8412ef207627ca2a041f2dd8822c2d8990df8e0f17ffdfc865a1662991a80680c484ddef505758578177d358c2e56003003a2cb685f07a41d6a9feb SHA512 4258fdfab59946a4955f053cf0b73f964d5bdf25ac9357ef8f4cb21948299fb749bf0c0e89a9c1e95a8606e74c6b3a3630fb4f6316815d83882a9531e3b78b5a
diff --git a/dev-python/cryptography/cryptography-36.0.0.ebuild b/dev-python/cryptography/cryptography-36.0.2.ebuild
index 7e3df42ef5ce..93e1b67da032 100644
--- a/dev-python/cryptography/cryptography-36.0.0.ebuild
+++ b/dev-python/cryptography/cryptography-36.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021 Liguros Authors
+# Copyright 2021-2022 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
 CARGO_OPTIONAL=yes
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 PYTHON_REQ_USE="threads(+)"
 
 CRATES="
@@ -57,7 +57,7 @@ winapi-x86_64-pc-windows-gnu-0.4.0
 "
 inherit cargo distutils-r1 multiprocessing
 
-GIT_TAG="5d21990c32d0f93df4e54ef4ee7ff3a2dae3c3da"
+GIT_TAG="df06889f348d7c3b7e9c35e4e5a1b1480f0b2c5a"
 DESCRIPTION="Library providing cryptographic recipes and primitives"
 HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
 SRC_URI="https://github.com/pyca/cryptography/archive/${GIT_TAG}.tar.gz -> ${PN}-${GIT_TAG}.tar.gz
@@ -99,6 +99,10 @@ S="${WORKDIR}/${PN}-${GIT_TAG}"
 
 distutils_enable_tests pytest
 
+PATCHES=(
+"${FILESDIR}/${P}-libressl.patch"
+)
+
 src_unpack() {
 	cargo_src_unpack
 }
@@ -118,6 +122,7 @@ src_prepare() {
 }
 
 python_test() {
-	local -x PYTHONPATH="${PYTHONPATH}:${S}/vectors"
+	#local -x PYTHONPATH="${PYTHONPATH}:${S}/vectors"
+	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
 	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
 }
diff --git a/dev-python/cryptography/files/cryptography-36.0.2-libressl.patch b/dev-python/cryptography/files/cryptography-36.0.2-libressl.patch
new file mode 100644
index 000000000000..3e3722115455
--- /dev/null
+++ b/dev-python/cryptography/files/cryptography-36.0.2-libressl.patch
@@ -0,0 +1,102 @@
+commit 8a98c812c3346e6c18b6d067e036fad63e30fcc1
+Author: Charlie Li <vishwin@users.noreply.github.com>
+Date:   Wed Mar 2 06:48:49 2022 -0500
+
+    Support LibreSSL 3.5.0 (#6919)
+    
+    * Add LibreSSL 3.5.0 to CI
+    
+    * Add LibreSSL 3.5.0 guard
+    
+    * Expose FIPS functions in LibreSSL 3.5.0+
+    
+    * Expose DH API in LibreSSL 3.5.0+
+    
+    * Expose SSL_get0_verified_chain and SSL_CTX_{set,get}_keylog_callback in LibreSSL 3.5.0+
+    
+    * Fix SSL_CTX_{set,get}_keylog_callback guard
+    
+    * Add missing CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 symbol
+    
+    * Fix SSL_CTX_{set,get}_keylog_callback guard again
+    
+    * Condense LibreSSL 3.5.0 defines
+    
+    * Kick CircleCI
+
+diff --git a/src/_cffi_src/openssl/cryptography.py b/src/_cffi_src/openssl/cryptography.py
+index 7d36feb5..03019e0a 100644
+--- a/src/_cffi_src/openssl/cryptography.py
++++ b/src/_cffi_src/openssl/cryptography.py
+@@ -43,9 +43,13 @@ INCLUDES = """
+     (LIBRESSL_VERSION_NUMBER < 0x3030200f)
+ #define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_340 \
+     (LIBRESSL_VERSION_NUMBER < 0x3040000f)
++#define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 \
++    (LIBRESSL_VERSION_NUMBER < 0x3050000f)
++
+ #else
+ #define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_332 (0)
+ #define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_340 (0)
++#define CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 (0)
+ #endif
+ 
+ #if OPENSSL_VERSION_NUMBER < 0x10100000
+@@ -84,6 +88,9 @@ static const int CRYPTOGRAPHY_OPENSSL_LESS_THAN_111;
+ static const int CRYPTOGRAPHY_OPENSSL_LESS_THAN_111B;
+ static const int CRYPTOGRAPHY_NEEDS_OSRANDOM_ENGINE;
+ 
++static const int CRYPTOGRAPHY_LIBRESSL_LESS_THAN_340;
++static const int CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350;
++
+ static const int CRYPTOGRAPHY_IS_LIBRESSL;
+ static const int CRYPTOGRAPHY_IS_BORINGSSL;
+ """
+diff --git a/src/_cffi_src/openssl/dh.py b/src/_cffi_src/openssl/dh.py
+index b369bf9f..c378ad1b 100644
+--- a/src/_cffi_src/openssl/dh.py
++++ b/src/_cffi_src/openssl/dh.py
+@@ -36,7 +36,7 @@ int Cryptography_i2d_DHxparams_bio(BIO *, DH *);
+ """
+ 
+ CUSTOMIZATIONS = """
+-#if CRYPTOGRAPHY_IS_LIBRESSL
++#if CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350
+ #ifndef DH_CHECK_Q_NOT_PRIME
+ #define DH_CHECK_Q_NOT_PRIME            0x10
+ #endif
+diff --git a/src/_cffi_src/openssl/fips.py b/src/_cffi_src/openssl/fips.py
+index 23c10af9..dd81d06c 100644
+--- a/src/_cffi_src/openssl/fips.py
++++ b/src/_cffi_src/openssl/fips.py
+@@ -17,7 +17,7 @@ int FIPS_mode(void);
+ """
+ 
+ CUSTOMIZATIONS = """
+-#if CRYPTOGRAPHY_IS_LIBRESSL || CRYPTOGRAPHY_OPENSSL_300_OR_GREATER
++#if CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 || CRYPTOGRAPHY_OPENSSL_300_OR_GREATER
+ static const long Cryptography_HAS_FIPS = 0;
+ int (*FIPS_mode_set)(int) = NULL;
+ int (*FIPS_mode)(void) = NULL;
+diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
+index 3ec82fb6..2d93fe24 100644
+--- a/src/_cffi_src/openssl/ssl.py
++++ b/src/_cffi_src/openssl/ssl.py
+@@ -527,14 +527,15 @@ static const long Cryptography_HAS_TLSEXT_HOSTNAME = 1;
+ int (*SSL_CTX_set_client_cert_engine)(SSL_CTX *, ENGINE *) = NULL;
+ #endif
+ 
+-#if CRYPTOGRAPHY_IS_LIBRESSL || CRYPTOGRAPHY_IS_BORINGSSL
++#if CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 || CRYPTOGRAPHY_IS_BORINGSSL
+ static const long Cryptography_HAS_VERIFIED_CHAIN = 0;
+ Cryptography_STACK_OF_X509 *(*SSL_get0_verified_chain)(const SSL *) = NULL;
+ #else
+ static const long Cryptography_HAS_VERIFIED_CHAIN = 1;
+ #endif
+ 
+-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_111
++#if CRYPTOGRAPHY_LIBRESSL_LESS_THAN_350 || \
++    (CRYPTOGRAPHY_OPENSSL_LESS_THAN_111 && !CRYPTOGRAPHY_IS_LIBRESSL)
+ static const long Cryptography_HAS_KEYLOG = 0;
+ void (*SSL_CTX_set_keylog_callback)(SSL_CTX *,
+                                     void (*) (const SSL *, const char *)