Skip to content

Commit 53dc686

Browse files
reaperhulkdependabot[bot]alex
authored
Backport null fix (#9007)
* Bump openssl from 0.10.53 to 0.10.54 in /src/rust (#9004) Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.53 to 0.10.54. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](sfackler/rust-openssl@openssl-v0.10.53...openssl-v0.10.54) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Added tests for NUL bytes in PKCS8 passphrases (#9001) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Alex Gaynor <[email protected]>
1 parent b999005 commit 53dc686

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

src/rust/Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/rust/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cryptography-x509 = { path = "cryptography-x509" }
1616
cryptography-openssl = { path = "cryptography-openssl" }
1717
pem = "1.1"
1818
ouroboros = "0.15"
19-
openssl = "0.10.53"
19+
openssl = "0.10.54"
2020
openssl-sys = "0.9.88"
2121
foreign-types-shared = "0.1"
2222

src/rust/cryptography-openssl/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ publish = false
88
rust-version = "1.56.0"
99

1010
[dependencies]
11-
openssl = "0.10.53"
11+
openssl = "0.10.54"
1212
ffi = { package = "openssl-sys", version = "0.9.85" }
1313
foreign-types = "0.3"
1414
foreign-types-shared = "0.1"

tests/hazmat/primitives/test_ed25519.py

+7
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,13 @@ def test_invalid_public_bytes(self, backend):
245245
None,
246246
serialization.load_der_private_key,
247247
),
248+
(
249+
serialization.Encoding.DER,
250+
serialization.PrivateFormat.PKCS8,
251+
serialization.BestAvailableEncryption(b"\x00"),
252+
b"\x00",
253+
serialization.load_der_private_key,
254+
),
248255
],
249256
)
250257
def test_round_trip_private_serialization(

0 commit comments

Comments
 (0)