gss-api: reunite with the workspace

Author: baloo

.github/workflows/gss-api.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -52,7 +52,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.81.0 # MSRV
+          - 1.85.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

Cargo.lock

@@ -10,7 +10,7 @@ members = [
     "crmf",
     "der",
     "der_derive",
-    #"gss-api",
+    "gss-api",
     "pem-rfc7468",
     "pkcs1",
     "pkcs5",
@@ -29,7 +29,6 @@ members = [
 ]
 exclude = [
     "base64ct",
-    "gss-api",
     "pkcs12",
     "x509-tsp",
     "x509-ocsp"

Cargo.toml

@@ -12,8 +12,8 @@ repository = "https://github.com/RustCrypto/formats"
 categories = ["cryptography", "authentication", "encoding", "no-std", "parser-implementations"]
 keywords = ["crypto", "gssapi", "kerberos", "krb5"]
 readme = "README.md"
-edition = "2021"
-rust-version = "1.81"
+edition = "2024"
+rust-version = "1.85"
 
 [dependencies]
 der = { version = "0.8.0-rc.0", features = ["oid", "alloc"] }

gss-api/Cargo.lock

@@ -57,7 +57,7 @@ pub struct InitialContextToken<'a> {
 impl FixedTag for InitialContextToken<'_> {
     const TAG: Tag = Tag::Application {
         constructed: true,
-        number: TagNumber::new(0),
+        number: TagNumber(0),
     };
 }
 
@@ -130,8 +130,12 @@ mod tests {
 
     #[test]
     fn initial_context_token() {
-        let gss_bytes = hex!("604806062b0601050502a03e303ca00e300c060a2b06010401823702020aa22a04284e544c4d535350000100000005028862000000000000000000000000000000000601b01d0000000f");
-        let inner_bytes = hex!("303ca00e300c060a2b06010401823702020aa22a04284e544c4d535350000100000005028862000000000000000000000000000000000601b01d0000000f");
+        let gss_bytes = hex!(
+            "604806062b0601050502a03e303ca00e300c060a2b06010401823702020aa22a04284e544c4d535350000100000005028862000000000000000000000000000000000601b01d0000000f"
+        );
+        let inner_bytes = hex!(
+            "303ca00e300c060a2b06010401823702020aa22a04284e544c4d535350000100000005028862000000000000000000000000000000000601b01d0000000f"
+        );
 
         let gss = InitialContextToken::from_der(&gss_bytes).unwrap();
 
@@ -140,7 +144,7 @@ mod tests {
             AnyRef::new(
                 Tag::ContextSpecific {
                     constructed: true,
-                    number: TagNumber::new(0)
+                    number: TagNumber(0)
                 },
                 &inner_bytes
             )
@@ -153,7 +157,7 @@ mod tests {
             inner_context_token: AnyRef::new(
                 Tag::ContextSpecific {
                     constructed: true,
-                    number: TagNumber::new(0),
+                    number: TagNumber(0),
                 },
                 &inner_bytes,
             )

gss-api/Cargo.toml

@@ -1,7 +1,7 @@
 //! Negotiation-related types
 use der::{
-    asn1::{BitString, OctetStringRef},
     AnyRef, Choice, Enumerated, Sequence,
+    asn1::{BitString, OctetStringRef},
 };
 
 use crate::MechType;
@@ -378,7 +378,9 @@ mod tests {
 
     #[test]
     fn token_init() {
-        let neg_token_init_bytes = hex!("303ca00e300c060a2b06010401823702020aa32a3028a0261b246e6f745f646566696e65645f696e5f5246433431373840706c656173655f69676e6f7265");
+        let neg_token_init_bytes = hex!(
+            "303ca00e300c060a2b06010401823702020aa32a3028a0261b246e6f745f646566696e65645f696e5f5246433431373840706c656173655f69676e6f7265"
+        );
         let neg_token = NegTokenInit2::from_der(&neg_token_init_bytes).unwrap();
         assert_eq!(
             1,
@@ -393,7 +395,9 @@ mod tests {
 
     #[test]
     fn token_response() {
-        let neg_token_resp_bytes = hex!("308199a0030a0101a10c060a2b06010401823702020aa281830481804e544c4d53535000020000000a000a003800000005028a6234805409a0e0e1f900000000000000003e003e0042000000060100000000000f530041004d004200410002000a00530041004d004200410001000a00530041004d00420041000400000003000a00730061006d00620061000700080036739dbd327fd90100000000");
+        let neg_token_resp_bytes = hex!(
+            "308199a0030a0101a10c060a2b06010401823702020aa281830481804e544c4d53535000020000000a000a003800000005028a6234805409a0e0e1f900000000000000003e003e0042000000060100000000000f530041004d004200410002000a00530041004d004200410001000a00530041004d00420041000400000003000a00730061006d00620061000700080036739dbd327fd90100000000"
+        );
         let neg_token_resp = NegTokenResp::from_der(&neg_token_resp_bytes).unwrap();
         assert_eq!(
             ObjectIdentifier::new_unwrap("1.3.6.1.4.1.311.2.2.10"),
@@ -404,7 +408,9 @@ mod tests {
     #[cfg(feature = "rfc2478")]
     #[test]
     fn decode_rfc2478() {
-        let neg_token_targ_bytes = hex!("308199a0030a0101a10c060a2b06010401823702020aa281830481804e544c4d53535000020000000a000a003800000005028a6234805409a0e0e1f900000000000000003e003e0042000000060100000000000f530041004d004200410002000a00530041004d004200410001000a00530041004d00420041000400000003000a00730061006d00620061000700080036739dbd327fd90100000000");
+        let neg_token_targ_bytes = hex!(
+            "308199a0030a0101a10c060a2b06010401823702020aa281830481804e544c4d53535000020000000a000a003800000005028a6234805409a0e0e1f900000000000000003e003e0042000000060100000000000f530041004d004200410002000a00530041004d004200410001000a00530041004d00420041000400000003000a00730061006d00620061000700080036739dbd327fd90100000000"
+        );
         let neg_token_targ = NegTokenTarg::from_der(&neg_token_targ_bytes).unwrap();
         assert_eq!(
             NegResult::AcceptIncomplete,