Incorporated Review Comments

Signed-off-by: Yogesh Deshpande <[email protected]>
veraison · Mar 7, 2024 · c9b9c6d · c9b9c6d
1 parent 7862a1b
commit c9b9c6d
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 25 deletions.
diff --git a/cocli/data/comid/templates/comid-cca-realm-refval.json b/cocli/data/comid/templates/comid-cca-realm-refval.json
@@ -41,12 +41,27 @@
                                         "sha-384;QoS1aUymwNLPR4mguVrIAlyBjeUjBDZL580pgbLS7caFsyInfsJYGZYkE9jJssH1"
                                     ]
                                 },
-                                "rem": {
+                                "rem0": {
+                                    "key-type": "text",
+                                    "value": [
+                                        "sha-384;IQe752H8pS2VE2oTVNt6TdV7Gya+DT2nHZ6yOYazS6YVq/ZRTPNeWp6lWgMtBop4"
+                                    ]
+                                },
+                                "rem1": {
+                                    "key-type": "text",
+                                    "value": [
+                                        "sha-384;JQe752H8pS2VE2oTVNt6TdV7Gya+DT2nHZ6yOYazS6YVq/ZRTPNeWp6lWgMtBop4"
+                                    ]
+                                },
+                                "rem2": {
+                                    "key-type": "text",
+                                    "value": [
+                                        "sha-384;MQe752H8pS2VE2oTVNt6TdV7Gya+DT2nHZ6yOYazS6YVq/ZRTPNeWp6lWgMtBop4"
+                                    ]
+                                },
+                                "rem3": {
                                     "key-type": "text",
                                     "value": [
-                                        "sha-384;IQe752H8pS2VE2oTVNt6TdV7Gya+DT2nHZ6yOYazS6YVq/ZRTPNeWp6lWgMtBop4",
-                                        "sha-384;JQe752H8pS2VE2oTVNt6TdV7Gya+DT2nHZ6yOYazS6YVq/ZRTPNeWp6lWgMtBop4",
-                                        "sha-384;MQe752H8pS2VE2oTVNt6TdV7Gya+DT2nHZ6yOYazS6YVq/ZRTPNeWp6lWgMtBop4",
                                         "sha-384;NQe752H8pS2VE2oTVNt6TdV7Gya+DT2nHZ6yOYazS6YVq/ZRTPNeWp6lWgMtBop4"
                                     ]
                                 }

diff --git a/cocli/data/corim/templates/corim-cca-realm.json b/cocli/data/corim/templates/corim-cca-realm.json
@@ -1,11 +1,5 @@
 {
     "corim-id": "5c57e8f4-46cd-421b-91c9-08cf93e13cfc",
-    "dependent-rims": [
-        {
-            "href": "https://parent.example/rims/ccb3aa85-61b4-40f1-848e-02ad6e8a254b",
-            "thumbprint": "sha-256:5Fty9cDAtXLbTY06t+l/No/3TmI0eoJN7LZ6hOUiTXU="
-        }
-    ],
     "profiles": [
         "http://arm.com/cca/realm/1"
     ],

diff --git a/cocli/data/corim/templates/corim-cca.json b/cocli/data/corim/templates/corim-cca.json
@@ -1,11 +1,5 @@
 {
   "corim-id": "5c57e8f4-46cd-421b-91c9-08cf93e13cfc",
-  "dependent-rims": [
-    {
-      "href": "https://parent.example/rims/ccb3aa85-61b4-40f1-848e-02ad6e8a254b",
-      "thumbprint": "sha-256:5Fty9cDAtXLbTY06t+l/No/3TmI0eoJN7LZ6hOUiTXU="
-    }
-  ],
   "profiles": [
     "http://arm.com/cca/ssd/1"
   ],

diff --git a/comid/example_cca_realm_refval_test.go b/comid/example_cca_realm_refval_test.go
@@ -29,13 +29,16 @@ func Example_cca_realm_refval() {
 	// Index: rim
 	// Alg: sha-384
 	// Digest: 4284b5694ca6c0d2cf4789a0b95ac8025c818de52304364be7cd2981b2d2edc685b322277ec25819962413d8c9b2c1f5
-	// Index: rem
+	// Index: rem0
 	// Alg: sha-384
 	// Digest: 2107bbe761fca52d95136a1354db7a4dd57b1b26be0d3da71d9eb23986b34ba615abf6514cf35e5a9ea55a032d068a78
+	// Index: rem1
 	// Alg: sha-384
 	// Digest: 2507bbe761fca52d95136a1354db7a4dd57b1b26be0d3da71d9eb23986b34ba615abf6514cf35e5a9ea55a032d068a78
+	// Index: rem2
 	// Alg: sha-384
 	// Digest: 3107bbe761fca52d95136a1354db7a4dd57b1b26be0d3da71d9eb23986b34ba615abf6514cf35e5a9ea55a032d068a78
+	// Index: rem3
 	// Alg: sha-384
 	// Digest: 3507bbe761fca52d95136a1354db7a4dd57b1b26be0d3da71d9eb23986b34ba615abf6514cf35e5a9ea55a032d068a78
 
@@ -144,7 +147,7 @@ func extractIntegrityRegisters(r *IntegrityRegisters) error {
 		return fmt.Errorf("no integrity registers")
 	}
 
-	keys, err := extractRegisterIndex(r)
+	keys, err := extractRegisterIndexes(r)
 	if err != nil {
 		return fmt.Errorf("unable to extract register index: %v", err)
 	}
@@ -176,17 +179,23 @@ func extractRealmDigests(digests Digests) error {
 	return nil
 }
 
-func extractRegisterIndex(r *IntegrityRegisters) ([]string, error) {
-	var keys [2]string
+func extractRegisterIndexes(r *IntegrityRegisters) ([]string, error) {
+	var keys [5]string
 	for k := range r.m {
 		switch t := k.(type) {
 		case string:
 			key := strings.ToLower(t)
 			switch key {
 			case "rim":
 				keys[0] = key
-			case "rem":
+			case "rem0":
 				keys[1] = key
+			case "rem1":
+				keys[2] = key
+			case "rem2":
+				keys[3] = key
+			case "rem3":
+				keys[4] = key
 			default:
 				return nil, fmt.Errorf("unexpected register index: %s", key)
 			}

diff --git a/comid/test_vars.go b/comid/test_vars.go
@@ -482,12 +482,27 @@ var (
 									"sha-384;QoS1aUymwNLPR4mguVrIAlyBjeUjBDZL580pgbLS7caFsyInfsJYGZYkE9jJssH1"
 								]
 							},
-							"rem": {
+							"rem0": {
+								"key-type": "text",
+								"value": [
+									"sha-384;IQe752H8pS2VE2oTVNt6TdV7Gya+DT2nHZ6yOYazS6YVq/ZRTPNeWp6lWgMtBop4"
+								]
+							},
+							"rem1": {
+								"key-type": "text",
+								"value": [
+									"sha-384;JQe752H8pS2VE2oTVNt6TdV7Gya+DT2nHZ6yOYazS6YVq/ZRTPNeWp6lWgMtBop4"
+								]
+							},
+							"rem2": {
+								"key-type": "text",
+								"value": [
+									"sha-384;MQe752H8pS2VE2oTVNt6TdV7Gya+DT2nHZ6yOYazS6YVq/ZRTPNeWp6lWgMtBop4"
+								]
+							},
+							"rem3": {
 								"key-type": "text",
 								"value": [
-									"sha-384;IQe752H8pS2VE2oTVNt6TdV7Gya+DT2nHZ6yOYazS6YVq/ZRTPNeWp6lWgMtBop4",
-									"sha-384;JQe752H8pS2VE2oTVNt6TdV7Gya+DT2nHZ6yOYazS6YVq/ZRTPNeWp6lWgMtBop4",
-									"sha-384;MQe752H8pS2VE2oTVNt6TdV7Gya+DT2nHZ6yOYazS6YVq/ZRTPNeWp6lWgMtBop4",
 									"sha-384;NQe752H8pS2VE2oTVNt6TdV7Gya+DT2nHZ6yOYazS6YVq/ZRTPNeWp6lWgMtBop4"
 								]
 							}