build(deps): bump cryptography from 41.0.6 to 42.0.4 #233
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?s=60&v=4){kind=small}
Bumps [cryptography](https://github.com/pyca/cryptography) from 41.0.6 to 42.0.4. - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](pyca/cryptography@41.0.6...42.0.4) --- updated-dependencies: - dependency-name: cryptography dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
dependabot
bot
added
dependencies
ctz
approved these changes
Feb 21, 2024
|
I started to look into the nightly clippy failures. I found this issue upstream, and the suggested workaround is quite similar to what the main rustls repo is already doing and so probably makes sense to adopt. Here's a branch to try it out and fix up some of the easy findings. I must be missing something obvious because the one last finding I see is this gated import in |
cpu
approved these changes
Feb 21, 2024
djc
approved these changes
Feb 22, 2024
|
Have admin-merged this one.
This worked for me: (and that matches the conditional against no_std, meaning that the crate gets the |
|
Actually, what about always setting diff --git a/src/alg_tests.rs b/src/alg_tests.rs
index f0fe5ae..4d2ade9 100644
--- a/src/alg_tests.rs
+++ b/src/alg_tests.rs
@@ -14,6 +14,8 @@
#![allow(clippy::duplicate_mod)]
+use std::prelude::v1::*;
+
use base64::{engine::general_purpose, Engine as _};
use crate::error::{DerTypeId, Error};
diff --git a/src/cert.rs b/src/cert.rs
index fdf1c94..4e280b1 100644
--- a/src/cert.rs
+++ b/src/cert.rs
@@ -343,6 +343,7 @@ mod tests {
use super::*;
#[cfg(feature = "alloc")]
use crate::crl::RevocationReason;
+ use std::prelude::v1::*;
#[test]
// Note: cert::parse_cert is crate-local visibility, and EndEntityCert doesn't expose the
diff --git a/src/crl/mod.rs b/src/crl/mod.rs
index 2ac9241..3355c40 100644
--- a/src/crl/mod.rs
+++ b/src/crl/mod.rs
@@ -237,6 +237,7 @@ pub struct CrlsRequired(pub(crate) ());
#[cfg(test)]
mod tests {
use super::*;
+ use std::println;
#[test]
// redundant clone, clone_on_copy allowed to verify derived traits.
diff --git a/src/crl/types.rs b/src/crl/types.rs
index 148dcf4..2576966 100644
--- a/src/crl/types.rs
+++ b/src/crl/types.rs
@@ -900,6 +900,8 @@ impl TryFrom<u8> for RevocationReason {
#[cfg(test)]
mod tests {
use pki_types::CertificateDer;
+ use std::prelude::v1::*;
+ use std::println;
use super::*;
use crate::cert::Cert;
diff --git a/src/der.rs b/src/der.rs
index 38a0001..aebc513 100644
--- a/src/der.rs
+++ b/src/der.rs
@@ -423,6 +423,7 @@ macro_rules! oid {
#[cfg(test)]
mod tests {
use super::DerTypeId;
+ use std::prelude::v1::*;
#[test]
fn test_optional_boolean() {
diff --git a/src/end_entity.rs b/src/end_entity.rs
index 41a9efa..605f022 100644
--- a/src/end_entity.rs
+++ b/src/end_entity.rs
@@ -186,6 +186,7 @@ impl<'a> Deref for EndEntityCert<'a> {
mod tests {
use super::*;
use crate::test_utils;
+ use std::prelude::v1::*;
// This test reproduces https://github.com/rustls/webpki/issues/167 --- an
// end-entity cert where the common name is a `PrintableString` rather than
diff --git a/src/lib.rs b/src/lib.rs
index 5b05632..5d2fc9d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -26,7 +26,7 @@
//! | `ring` | Enable use of the *ring* crate for cryptography. |
//! | `aws_lc_rs` | Enable use of the aws-lc-rs crate for cryptography. |
-#![cfg_attr(not(test), no_std)]
+#![no_std]
#![warn(unreachable_pub)]
#![deny(missing_docs, clippy::as_conversions)]
#![allow(
@@ -40,7 +40,7 @@
// Enable documentation for all features on docs.rs
#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
-#[cfg(feature = "std")]
+#[cfg(any(feature = "std", test))]
extern crate std;
#[cfg(any(test, feature = "alloc"))]
diff --git a/src/test_utils.rs b/src/test_utils.rs
index 9685bcf..0b5dd7e 100644
--- a/src/test_utils.rs
+++ b/src/test_utils.rs
@@ -1,4 +1,5 @@
#![cfg(feature = "alloc")]
+use std::prelude::v1::*;
use crate::types::CertificateDer;
diff --git a/src/verify_cert.rs b/src/verify_cert.rs
index 733d498..6cc6d77 100644
--- a/src/verify_cert.rs
+++ b/src/verify_cert.rs
@@ -704,6 +704,8 @@ mod tests {
use super::*;
use crate::test_utils::{issuer_params, make_end_entity, make_issuer};
use crate::trust_anchor::anchor_from_trusted_cert;
+ use std::dbg;
+ use std::prelude::v1::*;
#[test]
fn eku_key_purpose_id() {
|
Yeah, agreed
I like that approach 👍 Thanks for picking up where I left off. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps cryptography from 41.0.6 to 42.0.4.
Changelog
Sourced from cryptography's changelog.
... (truncated)
Commits
fe18470Bump for 42.0.4 release (#10445)aaa2dd0Fix ASN.1 issues in PKCS#7 and S/MIME signing (#10373) (#10442)7a4d012Fixes #10422 -- don't crash when a PKCS#12 key and cert don't match (#10423) ...df314bbbackport actions m1 switch to 42.0.x (#10415)c49a7a5changelog and version bump for 42.0.3 (#10396)396bcf6fix provider loading take two (#10390) (#10395)0e0e46fbackport: initialize openssl's legacy provider in rust (#10323) (#10333)2202123changelog and version bump 42.0.2 (#10268)f7032bdbump openssl in CI (#10298) (#10299)002e886Fixes #10294 -- correct accidental change to exchange kwarg (#10295) (#10296)Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)You can disable automated security fix PRs for this repo from the Security Alerts page.