@@ -83,32 +83,46 @@ impl HybridKeyPair {
8383 // Load Kyber keys from serialized files with better error handling
8484 let kyber_pub_path_obj = std:: path:: Path :: new ( kyber_pub_path) ;
8585 let kyber_sec_path_obj = std:: path:: Path :: new ( kyber_sec_path) ;
86-
86+
8787 // Check if Kyber key files exist before trying to read them
8888 if !kyber_pub_path_obj. exists ( ) {
8989 return Err ( PostQuantumError :: Io ( io:: Error :: new (
9090 io:: ErrorKind :: NotFound ,
91- format ! ( "Kyber public key file not found at: {:?}" , kyber_pub_path_obj) ,
91+ format ! (
92+ "Kyber public key file not found at: {:?}" ,
93+ kyber_pub_path_obj
94+ ) ,
9295 ) ) ) ;
9396 }
94-
97+
9598 if !kyber_sec_path_obj. exists ( ) {
9699 return Err ( PostQuantumError :: Io ( io:: Error :: new (
97100 io:: ErrorKind :: NotFound ,
98- format ! ( "Kyber secret key file not found at: {:?}" , kyber_sec_path_obj) ,
101+ format ! (
102+ "Kyber secret key file not found at: {:?}" ,
103+ kyber_sec_path_obj
104+ ) ,
99105 ) ) ) ;
100106 }
101-
102- let kyber_public_bytes =
103- std :: fs :: read ( kyber_pub_path ) . map_err ( |e| PostQuantumError :: Io ( io:: Error :: new (
107+
108+ let kyber_public_bytes = std :: fs :: read ( kyber_pub_path ) . map_err ( |e| {
109+ PostQuantumError :: Io ( io:: Error :: new (
104110 e. kind ( ) ,
105- format ! ( "Failed to read Kyber public key from {:?}: {}" , kyber_pub_path_obj, e) ,
106- ) ) ) ?;
107- let kyber_secret_bytes =
108- std:: fs:: read ( kyber_sec_path) . map_err ( |e| PostQuantumError :: Io ( io:: Error :: new (
111+ format ! (
112+ "Failed to read Kyber public key from {:?}: {}" ,
113+ kyber_pub_path_obj, e
114+ ) ,
115+ ) )
116+ } ) ?;
117+ let kyber_secret_bytes = std:: fs:: read ( kyber_sec_path) . map_err ( |e| {
118+ PostQuantumError :: Io ( io:: Error :: new (
109119 e. kind ( ) ,
110- format ! ( "Failed to read Kyber secret key from {:?}: {}" , kyber_sec_path_obj, e) ,
111- ) ) ) ?;
120+ format ! (
121+ "Failed to read Kyber secret key from {:?}: {}" ,
122+ kyber_sec_path_obj, e
123+ ) ,
124+ ) )
125+ } ) ?;
112126
113127 // Deserialize Kyber keys
114128 let kyber_public = Kyber512PublicKey :: from_bytes ( & kyber_public_bytes) . map_err ( |e| {
0 commit comments