From c93febe9aef364e1bfad77d1c63e8d1e3689f550 Mon Sep 17 00:00:00 2001
From: rooooooooob <raftias@gmail.com>
Date: Tue, 18 Jan 2022 15:58:18 -0800
Subject: [PATCH] Ed25519Key crv field has incorrect value

Fixes #9

Due to how wasm_bindgen works direct enums were not allowed so the rust
values of enums are NOT what their value when converted to `Label`. This
rust value was used in the `crv` field of the `Ed25519Key` builder by
accident.
---
 rust/src/builders.rs | 13 ++++++++++++-
 rust/src/cbor.rs     |  7 +++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/rust/src/builders.rs b/rust/src/builders.rs
index f8d0b7f..abf4dca 100644
--- a/rust/src/builders.rs
+++ b/rust/src/builders.rs
@@ -208,7 +208,7 @@ impl EdDSA25519Key {
         // crv
         key.other_headers.insert(
             ECKey::CRV.into(),
-            CBORValue::new_int(&Int::new(to_bignum(CurveType::Ed25519 as u64))));
+            CBORValue::from_label(&Label::from(CurveType::Ed25519)));
         // x
         key.other_headers.insert(
             ECKey::X.into(),
@@ -250,4 +250,15 @@ mod tests {
     //     let payload = vec![0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
     //     let mut builder = COSESign1Builder::new(&headers, payload, true);
     // }
+
+    #[test]
+    fn eddsa25519key() {
+        let xpub = vec![0; 32];
+        let key = EdDSA25519Key::new(xpub.clone()).build();
+        // these serve to test the enum implementations too
+        assert_eq!(key.key_type().as_int().unwrap().as_i32().unwrap(), 1);
+        assert_eq!(key.algorithm_id().unwrap().as_int().unwrap().as_i32().unwrap(), -8);
+        assert_eq!(key.header(&Label::new_int(&Int::new_i32(-1))).unwrap().as_int().unwrap().as_i32().unwrap(), 6);
+        assert_eq!(key.header(&Label::new_int(&Int::new_i32(-2))).unwrap().as_bytes().unwrap(), xpub);
+    }
 }
\ No newline at end of file
diff --git a/rust/src/cbor.rs b/rust/src/cbor.rs
index d72c1af..04f142e 100644
--- a/rust/src/cbor.rs
+++ b/rust/src/cbor.rs
@@ -339,6 +339,13 @@ impl CBORValue {
         Self(CBORValueEnum::Special(special.clone()))
     }
 
+    pub fn from_label(label: &Label) -> Self {
+        match &label.0 {
+            LabelEnum::Int(x) => Self::new_int(x),
+            LabelEnum::Text(x) => Self::new_text(x.clone()),
+        }
+    }
+
     pub fn kind(&self) -> CBORValueKind {
         match &self.0 {
             CBORValueEnum::Int(_) => CBORValueKind::Int,