Add missing traits necessary for cliclack

Yubico · Oct 17, 2023 · 9f49402 · 9f49402
1 parent bd5ece8
commit 9f49402
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 20 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -35,6 +35,7 @@ regex = "0.2.2"
 rustc-serialize = "0.3.24"
 strum = "0.24"
 strum_macros = "0.24"
+serde = { version = "1.0.164", features = ["derive"] }
 
 [dev-dependencies]
 base64 = "0.7.0"

diff --git a/src/lib.rs b/src/lib.rs
@@ -38,6 +38,8 @@ extern crate log;
 extern crate regex;
 extern crate rustc_serialize;
 
+extern crate serde;
+
 use std::ffi::c_char;
 use lyh::{yh_algorithm, yh_capabilities, yh_connector, yh_rc, yh_session};
 
@@ -311,7 +313,7 @@ impl Session {
         id: u16,
         label: &str,
         domains: &[ObjectDomain],
-        object_capabilities: &[ObjectCapability],
+        capabilities: &[ObjectCapability],
         delegated_capabilities: &[ObjectCapability],
         password: &[u8],
     ) -> Result<u16, Error> {
@@ -325,7 +327,7 @@ impl Session {
                 &mut real_id,
                 c_str.as_ptr(),
                 ObjectDomain::primitive_from_slice(domains),
-                &ObjectCapability::primitive_from_slice(object_capabilities),
+                &ObjectCapability::primitive_from_slice(capabilities),
                 &ObjectCapability::primitive_from_slice(delegated_capabilities),
                 password.as_ptr(),
                 password.len(),
@@ -342,7 +344,7 @@ impl Session {
         id: u16,
         label: &str,
         domains: &[ObjectDomain],
-        object_capabilities: &[ObjectCapability],
+        capabilities: &[ObjectCapability],
         algorithm: ObjectAlgorithm,
         delegated_capabilities: &[ObjectCapability],
     ) -> Result<u16, Error> {
@@ -356,7 +358,7 @@ impl Session {
                 &mut real_id,
                 c_str.as_ptr(),
                 ObjectDomain::primitive_from_slice(domains),
-                &ObjectCapability::primitive_from_slice(object_capabilities),
+                &ObjectCapability::primitive_from_slice(capabilities),
                 algorithm.into(),
                 &ObjectCapability::primitive_from_slice(delegated_capabilities),
             )
@@ -374,7 +376,7 @@ impl Session {
         id: u16,
         label: &str,
         domains: &[ObjectDomain],
-        object_capabilities: &[ObjectCapability],
+        capabilities: &[ObjectCapability],
         algorithm: ObjectAlgorithm,
         delegated_capabilities: &[ObjectCapability],
         wrapkey: &[u8],
@@ -389,7 +391,7 @@ impl Session {
                 &mut real_id,
                 c_str.as_ptr(),
                 ObjectDomain::primitive_from_slice(domains),
-                &ObjectCapability::primitive_from_slice(object_capabilities),
+                &ObjectCapability::primitive_from_slice(capabilities),
                 algorithm.into(),
                 &ObjectCapability::primitive_from_slice(delegated_capabilities),
                 wrapkey.as_ptr(),
@@ -409,7 +411,7 @@ impl Session {
         id: u16,
         label: &str,
         domains: &[ObjectDomain],
-        object_capabilities: &[ObjectCapability],
+        capabilities: &[ObjectCapability],
         algorithm: ObjectAlgorithm,
         p: &[u8],
         q: &[u8],
@@ -424,7 +426,7 @@ impl Session {
                 &mut real_id,
                 c_str.as_ptr(),
                 ObjectDomain::primitive_from_slice(domains),
-                &ObjectCapability::primitive_from_slice(object_capabilities),
+                &ObjectCapability::primitive_from_slice(capabilities),
                 algorithm.into(),
                 p.as_ptr(),
                 q.as_ptr(),
@@ -442,7 +444,7 @@ impl Session {
         id: u16,
         label: &str,
         domains: &[ObjectDomain],
-        object_capabilities: &[ObjectCapability],
+        capabilities: &[ObjectCapability],
         algorithm: ObjectAlgorithm,
         s: &[u8],
     ) -> Result<u16, Error> {
@@ -456,7 +458,7 @@ impl Session {
                 &mut real_id,
                 c_str.as_ptr(),
                 ObjectDomain::primitive_from_slice(domains),
-                &ObjectCapability::primitive_from_slice(object_capabilities),
+                &ObjectCapability::primitive_from_slice(capabilities),
                 algorithm.into(),
                 s.as_ptr(),
             )
@@ -473,7 +475,7 @@ impl Session {
         id: u16,
         label: &str,
         domains: &[ObjectDomain],
-        object_capabilities: &[ObjectCapability],
+        capabilities: &[ObjectCapability],
         k: &[u8],
     ) -> Result<u16, Error> {
         let mut real_id = id;
@@ -486,7 +488,7 @@ impl Session {
                 &mut real_id,
                 c_str.as_ptr(),
                 ObjectDomain::primitive_from_slice(domains),
-                &ObjectCapability::primitive_from_slice(object_capabilities),
+                &ObjectCapability::primitive_from_slice(capabilities),
                 yh_algorithm::YH_ALGO_EC_ED25519,
                 k.as_ptr(),
             )
@@ -503,12 +505,12 @@ impl Session {
         id: u16,
         label: &str,
         domains: &[ObjectDomain],
+        capabilities: &[ObjectCapability],
         cert: &[u8],
     ) -> Result<u16, Error> {
         let mut real_id = id;
 
         let c_str = ::std::ffi::CString::new(label).unwrap();
-        let capabilities:[ObjectCapability; 0] = [];
 
         let res = unsafe {
             lyh::yh_util_import_opaque(

diff --git a/src/object.rs b/src/object.rs
@@ -28,12 +28,15 @@ use std::fmt::Display;
 
 use Session;
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)]
 /// Object types
 pub enum ObjectType {
     /// Opaque object
     Opaque,
     /// Authentication key
+    #[default]
     AuthenticationKey,
     /// Asymmetric key
     AsymmetricKey,
@@ -51,7 +54,7 @@ pub enum ObjectType {
     Any,
 }
 
-#[derive(Clone, Copy, PartialEq, Eq, std::hash::Hash)]
+#[derive(Clone, Copy, PartialEq, Eq, Default, std::hash::Hash, Serialize, Deserialize)]
 /// Object capabilities
 pub enum ObjectCapability {
     /// Get opaque object
@@ -87,6 +90,7 @@ pub enum ObjectCapability {
     /// Generate a wrap key
     GenerateWrapKey,
     /// Object is exportable under wrap
+    #[default]
     ExportableUnderWrap,
     /// Set option
     SetOption,
@@ -148,7 +152,7 @@ pub enum ObjectCapability {
     DeleteOtpAeadKey,
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 /// Object domains
 pub enum ObjectDomain {
     /// Domain one
@@ -185,7 +189,7 @@ pub enum ObjectDomain {
     Sixteen,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)]
 /// Object algorithms
 pub enum ObjectAlgorithm {
     /// RSA PKCS1v1.5 with SHA1
@@ -205,6 +209,7 @@ pub enum ObjectAlgorithm {
     /// RSA PSS with SHA512
     RsaPssSha512,
     /// RSA 2048
+    #[default]
     Rsa2048,
     /// RSA 3072
     Rsa3072,
@@ -288,10 +293,11 @@ pub enum ObjectAlgorithm {
     ANY,
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
 /// Object origin
 pub enum ObjectOrigin {
     /// Generate object
+    #[default]
     Generated,
     /// Imported object
     Imported,
@@ -301,7 +307,7 @@ pub enum ObjectOrigin {
     WrappedImported,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq, Default)]
 /// Object descriptor
 pub struct ObjectDescriptor {
     /// Ccapabilities
@@ -326,7 +332,7 @@ pub struct ObjectDescriptor {
     pub delegated_capabilities: Option<Vec<ObjectCapability>>,
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
 /// Object Handle
 pub struct ObjectHandle {
     /// Type