Expose error code for unknown errors

This makes debugging easier, since the error code is readily available.

Signed-off-by: Thore Goebel <[email protected]>

Author: thgoebel

cryptoki/src/error/rv.rs

@@ -120,10 +120,10 @@ impl From<CK_RV> for Rv {
             CKR_VENDOR_DEFINED..=CK_ULONG::MAX => Rv::Error(RvError::VendorDefined(ck_rv)),
             other => {
                 error!(
-                    "Can not find a corresponding error for {}, converting to GeneralError.",
+                    "Can not find a corresponding error for {}, converting to UnknownErrorCode.",
                     other
                 );
-                Rv::Error(RvError::GeneralError)
+                Rv::Error(RvError::UnknownErrorCode(other))
             }
         }
     }
@@ -159,4 +159,12 @@ mod test {
         let expected = Rv::Error(RvError::VendorDefined(code));
         assert_eq!(actual, expected);
     }
+
+    #[test]
+    fn unknown_code() {
+        let code = CKR_VENDOR_DEFINED - 42;
+        let actual = Rv::from(code);
+        let expected = Rv::Error(RvError::UnknownErrorCode(code));
+        assert_eq!(actual, expected);
+    }
 }

cryptoki/src/error/rv_error.rs

@@ -196,6 +196,8 @@ pub enum RvError {
     FunctionRejected,
     /// A vendor defined error code, CKR_VENDOR_DEFINED and above.
     VendorDefined(CK_RV),
+    /// An unknown error code
+    UnknownErrorCode(CK_RV),
 }
 
 impl fmt::Display for RvError {
@@ -295,6 +297,7 @@ impl fmt::Display for RvError {
             RvError::PublicKeyInvalid => write!(f, "The public key fails a public key validation.  For example, an EC public key fails the public key validation specified in Section 5.2.2 of ANSI X9.62. This error code may be returned by C_CreateObject, when the public key is created, or by C_VerifyInit or C_VerifyRecoverInit, when the public key is used.  It may also be returned by C_DeriveKey, in preference to  CKR_MECHANISM_PARAM_INVALID, if the other party's public key specified in the mechanism's parameters is invalid."),
             RvError::FunctionRejected => write!(f, "The signature request is rejected by the user."),
             RvError::VendorDefined(code) => write!(f, "CKR_VENDOR_DEFINED({code:#x})"),
+            RvError::UnknownErrorCode(code) => write!(f, "Unknown error code: {code:#x}"),
         }
     }
 }