summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python3-cryptography
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-05-05 07:04:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-05 21:17:37 +0100
commitf6a029b9de728ef18afdccabd6025fca857a79d9 (patch)
tree85ec35acaf581ff51158276fb3150e59f0c306f8 /meta/recipes-devtools/python/python3-cryptography
parent990b07108707a1b7c252b7d7e2e4c92410943859 (diff)
downloadpoky-f6a029b9de728ef18afdccabd6025fca857a79d9.tar.gz
python3-cryptography: upgrade 36.0.2 -> 37.0.1
Drop backported fix-leak-metric.patch. Adjust versions of crate components. (From OE-Core rev: 9a9b172da07c719aff3630bd25ec859e57f246f4) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3-cryptography')
-rw-r--r--meta/recipes-devtools/python/python3-cryptography/0001-Cargo.toml-specify-pem-version.patch12
-rw-r--r--meta/recipes-devtools/python/python3-cryptography/fix-leak-metric.patch36
2 files changed, 5 insertions, 43 deletions
diff --git a/meta/recipes-devtools/python/python3-cryptography/0001-Cargo.toml-specify-pem-version.patch b/meta/recipes-devtools/python/python3-cryptography/0001-Cargo.toml-specify-pem-version.patch
index d7ab757bb5..7266fd7bef 100644
--- a/meta/recipes-devtools/python/python3-cryptography/0001-Cargo.toml-specify-pem-version.patch
+++ b/meta/recipes-devtools/python/python3-cryptography/0001-Cargo.toml-specify-pem-version.patch
@@ -1,4 +1,4 @@
1From ec8d3f3c61280c8140b34ed1479baef5e706f064 Mon Sep 17 00:00:00 2001 1From d41203b9b79f5edc2d33b0d62921822294dfaa6b Mon Sep 17 00:00:00 2001
2From: Tim Orling <tim.orling@konsulko.com> 2From: Tim Orling <tim.orling@konsulko.com>
3Date: Fri, 14 Jan 2022 22:02:25 -0800 3Date: Fri, 14 Jan 2022 22:02:25 -0800
4Subject: [PATCH] Cargo.toml: specify pem version 4Subject: [PATCH] Cargo.toml: specify pem version
@@ -9,23 +9,21 @@ pem = { version: "1.0.2"}
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Tim Orling <tim.orling@konsulko.com> 11Signed-off-by: Tim Orling <tim.orling@konsulko.com>
12
12--- 13---
13 src/rust/Cargo.toml | 2 +- 14 src/rust/Cargo.toml | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
15 16
16diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml 17diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
17index 617167d0..174eaa80 100644 18index d17245d..f8f6416 100644
18--- a/src/rust/Cargo.toml 19--- a/src/rust/Cargo.toml
19+++ b/src/rust/Cargo.toml 20+++ b/src/rust/Cargo.toml
20@@ -9,7 +9,7 @@ publish = false 21@@ -9,7 +9,7 @@ publish = false
21 lazy_static = "1" 22 lazy_static = "1"
22 pyo3 = { version = "0.15.1" } 23 pyo3 = { version = "0.15.2" }
23 asn1 = { version = "0.8.7", default-features = false, features = ["derive"] } 24 asn1 = { version = "0.8.7", default-features = false, features = ["derive"] }
24-pem = "1.0" 25-pem = "1.0"
25+pem = { version = "1.0.2" } 26+pem = { version = "1.0.2" }
26 chrono = { version = "0.4", default-features = false, features = ["alloc", "clock"] } 27 chrono = { version = "0.4", default-features = false, features = ["alloc", "clock"] }
27 ouroboros = "0.13" 28 ouroboros = "0.15"
28 29
29--
302.30.2
31
diff --git a/meta/recipes-devtools/python/python3-cryptography/fix-leak-metric.patch b/meta/recipes-devtools/python/python3-cryptography/fix-leak-metric.patch
deleted file mode 100644
index 904984f43d..0000000000
--- a/meta/recipes-devtools/python/python3-cryptography/fix-leak-metric.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Trigger hashlib initialisation so that the test_create_certificate_with_extensions
2test doesn't fail.
3
4Upstream-Status: Backport
5Signed-off-by: Ross Burton <ross.burton@arm.com>
6
7From dc989d563ab6a078651160e5e6d4ee3df8cb08d7 Mon Sep 17 00:00:00 2001
8From: Alex Gaynor <alex.gaynor@gmail.com>
9Date: Thu, 7 Apr 2022 03:15:09 -0400
10Subject: [PATCH] Added Ubuntu Jammy to CI (#7047)
11
12* Added Ubuntu Jammy to CI
13
14* try thing
15---
16 .github/workflows/ci.yml | 1 +
17 docs/installation.rst | 2 +-
18 tests/hazmat/backends/test_openssl_memleak.py | 3 +++
19 3 files changed, 5 insertions(+), 1 deletion(-)
20
21diff --git a/tests/hazmat/backends/test_openssl_memleak.py b/tests/hazmat/backends/test_openssl_memleak.py
22index 835c9256a6..2605566bd5 100644
23--- a/tests/hazmat/backends/test_openssl_memleak.py
24+++ b/tests/hazmat/backends/test_openssl_memleak.py
25@@ -82,8 +82,11 @@ def free(ptr, path, line):
26 assert result == 1
27
28 # Trigger a bunch of initialization stuff.
29+ import hashlib
30 from cryptography.hazmat.backends.openssl.backend import backend
31
32+ hashlib.sha256()
33+
34 start_heap = set(heap)
35
36 try: