Merge branch 'master' into dishmaker/der_clarify

Author: dishmaker

der/Cargo.toml

@@ -37,13 +37,13 @@ alloc = ["zeroize?/alloc"]
 std = ["alloc"]
 
 arbitrary = ["dep:arbitrary", "const-oid?/arbitrary", "std"]
+ber = []
 bytes = ["dep:bytes", "alloc"]
+clarify = ["dep:tynm", "std", "pem", "derive", "oid"]
 derive = ["dep:der_derive"]
 oid = ["dep:const-oid"]
 pem = ["dep:pem-rfc7468", "alloc", "zeroize"]
 real = []
-ber = ["alloc"]
-clarify = ["dep:tynm", "std", "pem", "derive", "oid"]
 
 [package.metadata.docs.rs]
 all-features = true

der/src/asn1/octet_string.rs

@@ -374,7 +374,7 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "ber")]
+    #[cfg(all(feature = "alloc", feature = "ber"))]
     fn decode_ber() {
         use crate::{Decode, asn1::OctetString};
         use hex_literal::hex;
@@ -391,7 +391,7 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "ber")]
+    #[cfg(all(feature = "alloc", feature = "ber"))]
     fn decode_context_specific_ber_explicit() {
         use crate::{
             EncodingRules, SliceReader, TagNumber,
@@ -422,7 +422,7 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "ber")]
+    #[cfg(all(feature = "alloc", feature = "ber"))]
     fn decode_context_specific_ber_implicit() {
         use crate::{
             EncodingRules, SliceReader, TagNumber,