Skip to content

Commit

Permalink
Backport null fix (#9007)
Browse files Browse the repository at this point in the history
* 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] <support@github.com>
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] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alex Gaynor <alex.gaynor@gmail.com>
  • Loading branch information
3 people committed Jun 1, 2023
1 parent b999005 commit 53dc686
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cryptography-x509 = { path = "cryptography-x509" }
cryptography-openssl = { path = "cryptography-openssl" }
pem = "1.1"
ouroboros = "0.15"
openssl = "0.10.53"
openssl = "0.10.54"
openssl-sys = "0.9.88"
foreign-types-shared = "0.1"

Expand Down
2 changes: 1 addition & 1 deletion src/rust/cryptography-openssl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ publish = false
rust-version = "1.56.0"

[dependencies]
openssl = "0.10.53"
openssl = "0.10.54"
ffi = { package = "openssl-sys", version = "0.9.85" }
foreign-types = "0.3"
foreign-types-shared = "0.1"
7 changes: 7 additions & 0 deletions tests/hazmat/primitives/test_ed25519.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,13 @@ def test_invalid_public_bytes(self, backend):
None,
serialization.load_der_private_key,
),
(
serialization.Encoding.DER,
serialization.PrivateFormat.PKCS8,
serialization.BestAvailableEncryption(b"\x00"),
b"\x00",
serialization.load_der_private_key,
),
],
)
def test_round_trip_private_serialization(
Expand Down

0 comments on commit 53dc686

Please sign in to comment.