From 0fd389be27f0abc277cbc7edfde9efadc4515f62 Mon Sep 17 00:00:00 2001
From: Anthony Rocha <anthony.rocha@amd.com>
Date: Thu, 12 Dec 2024 10:34:46 -0800
Subject: [PATCH] FMC Alias CSR test

---
 .../test_data/fmc_alias_csr.der               | Bin 0 -> 447 bytes
 .../test_data/fmc_alias_csr.txt               |  33 ++++++++++++++++++
 .../test_get_fmc_alias_csr.rs                 |  13 +++++--
 3 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 runtime/tests/runtime_integration_tests/test_data/fmc_alias_csr.der
 create mode 100644 runtime/tests/runtime_integration_tests/test_data/fmc_alias_csr.txt

diff --git a/runtime/tests/runtime_integration_tests/test_data/fmc_alias_csr.der b/runtime/tests/runtime_integration_tests/test_data/fmc_alias_csr.der
new file mode 100644
index 0000000000000000000000000000000000000000..c20863f96c074789a71252b93f9b6f48a19e238e
GIT binary patch
literal 447
zcmXqLV%%-e#OTPx$Y79TC~qLk#vIDR%p>NUn3GvhQk1A*sAr(y=IgBBn3I`UZ0Kp=
z4pP7>>|kc<X6EE%?B?idVq)rI0EAA)W^TqV&K4$?mX=Ot22KX1md<Ww#xBOLMy77A
z1_sV1=1xY&mKLVwZpKbd24w~UZ0uTX9_MVC7};308(A2Xn3EV-PV-Hibv=F_(<jR=
zjg|JfpBc@}PsChSQ!6j*m>iSy!s_Ue-S=5<iypL?{^9GX$1Y`CUL4(_v9qaH@b;<7
zN&Y?3oaU!5eYJ7lc~`9>`sxkAX+inhuN(Hyn*Z?p+^HK<u39b#GYDbh1lrs7otKf5
z&(Ph#)j$a7Cs|=e#{VoF25dlziILTS4<yD95@TUzVq!6nXJbomWMySxVG%VDW)WmS
z2L@bh9AMwDFf%h}Fc_pV88V#zeCdWkTh#ZTS8S6nzdj@<_VuE*+zg9Tw*9x>&UNX(
z`pwa_xJ!g}VzPL|6#uaMub2${Z+q#feOmRV#PLbpp{%3qFE<AS?T*RtZhpmX%-O=d
WaA(*28{x$ptjm%<`_&uG_Xhy7@{@7^

literal 0
HcmV?d00001

diff --git a/runtime/tests/runtime_integration_tests/test_data/fmc_alias_csr.txt b/runtime/tests/runtime_integration_tests/test_data/fmc_alias_csr.txt
new file mode 100644
index 0000000000..ce75c7c787
--- /dev/null
+++ b/runtime/tests/runtime_integration_tests/test_data/fmc_alias_csr.txt
@@ -0,0 +1,33 @@
+Certificate Request:
+    Data:
+        Version: 1 (0x0)
+        Subject: CN=Caliptra 1.0 FMC Alias/serialNumber=65F6BB3FAE445D0D0DB36F3DC84999B60B059CF63D3E25FE00C47B239857F3BB
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:cb:0e:91:9a:d7:5f:9e:02:f2:39:8a:28:a9:3f:
+                    6d:f3:01:36:37:c8:5c:d3:26:26:77:71:88:93:5c:
+                    6c:e8:3a:c5:c4:bb:df:05:db:15:c1:38:97:f0:f5:
+                    ca:e3:44:76:b4:e8:c5:b8:28:b9:82:8d:11:db:ca:
+                    79:92:4f:8c:1b:09:37:cb:d2:f5:3c:47:b9:dd:26:
+                    78:5b:d5:d8:11:96:52:6f:b7:d7:31:8f:9a:9f:e1:
+                    cf:9d:95:b0:64:d5:39
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        Attributes:
+            Requested Extensions:
+                X509v3 Basic Constraints: critical
+                    CA:TRUE, pathlen:5
+                X509v3 Key Usage: critical
+                    Certificate Sign
+                2.23.133.5.4.4: 
+                    0....................
+    Signature Algorithm: ecdsa-with-SHA384
+    Signature Value:
+        30:65:02:31:00:cf:f3:d2:d8:30:86:5a:f7:f9:d4:3d:63:d3:
+        eb:c2:1e:16:f5:d1:3b:1e:98:38:ca:3d:8f:da:ed:9d:44:8f:
+        d5:f6:41:35:73:8a:14:05:91:63:17:58:94:4f:56:df:ea:02:
+        30:4f:db:4a:2e:26:f2:aa:ec:74:41:e4:7e:c2:6a:c5:07:e9:
+        b3:50:52:bb:5c:68:4b:83:ea:07:33:09:84:0b:a1:b9:8a:9f:
+        d8:57:73:b0:3b:76:62:f3:4e:7f:32:9f:4f
diff --git a/runtime/tests/runtime_integration_tests/test_get_fmc_alias_csr.rs b/runtime/tests/runtime_integration_tests/test_get_fmc_alias_csr.rs
index 25bc3d7387..737c964ae3 100644
--- a/runtime/tests/runtime_integration_tests/test_get_fmc_alias_csr.rs
+++ b/runtime/tests/runtime_integration_tests/test_get_fmc_alias_csr.rs
@@ -36,10 +36,17 @@ fn test_get_fmc_alias_csr() {
     );
     assert_ne!(0, get_fmc_alias_csr_resp.data_size);
 
-    let csr_bytes = &get_fmc_alias_csr_resp.data[..get_fmc_alias_csr_resp.data_size as usize];
-    assert_ne!([0; 512], csr_bytes);
+    let csr_der = &get_fmc_alias_csr_resp.data[..get_fmc_alias_csr_resp.data_size as usize];
+    assert_ne!([0; 512], csr_der);
+
+
+    let csr = openssl::x509::X509Req::from_der(&csr_der).unwrap();
+    let csr_txt = String::from_utf8(csr.to_text().unwrap()).unwrap();    
+
+  // To update the CSR testdata:
+    std::fs::write("tests/runtime_integration_tests/test_data/fmc_alias_csr.txt", &csr_txt).unwrap();
+    std::fs::write("tests/runtime_integration_tests/test_data/fmc_alias_csr.der", &csr_der).unwrap();
 
-    assert!(X509Req::from_der(csr_bytes).is_ok());
 }
 
 #[test]