Change PNV logic such that the claims are hints rather than musts.

netheril96 · netheril96 · commit ab01e880f1d7 · 2025-11-07T17:50:19.000Z
diff --git a/matcher/pnv/dcql.c b/matcher/pnv/dcql.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include <stdbool.h>
 
 #include "../base64.h"
 #include "../dcql.h"
@@ -24,6 +25,13 @@ int AddAllClaims(cJSON *matched_claim_names, cJSON *candidate_paths)
     return 0;
 }
 
+cJSON *CreateSingleStringArrayJson(char *string) 
+{
+    cJSON *array = cJSON_CreateArray();
+    cJSON_AddItemReferenceToArray(array, cJSON_CreateString(string));
+    return array;
+}
+
 cJSON *MatchCredential(cJSON *credential, cJSON *credential_store)
 {
     cJSON *matched_credentials = cJSON_CreateArray();
@@ -155,6 +163,19 @@ cJSON *MatchCredential(cJSON *credential, cJSON *credential_store)
     }
     else
     {
+        cJSON *matched_claim_paths = cJSON_CreateArray();
+
+        cJSON *phone_number_matched_candidates = cJSON_CreateArray();
+        cJSON *carrier_and_subscription_matched_candidates = cJSON_CreateArray();
+        cJSON *carrier_matched_candidates = cJSON_CreateArray();
+        cJSON *sub_matched_candidates = cJSON_CreateArray();
+        cJSON *other_candidates = cJSON_CreateArray();
+
+        cJSON *phone_number_hint_paths = CreateSingleStringArrayJson("phone_number_hint");
+        cJSON *subscription_hint_paths = CreateSingleStringArrayJson("subscription_hint");
+        cJSON *carrier_hint_paths = CreateSingleStringArrayJson("carrier_hint");
+
+        
         if (claim_sets == NULL)
         {
             printf("Matching based on provided claims\n");
@@ -176,7 +197,9 @@ cJSON *MatchCredential(cJSON *credential, cJSON *credential_store)
 
                 cJSON *claim;
                 cJSON *candidate_claims = cJSON_GetObjectItemCaseSensitive(candidate, "paths");
-                int matched_claim_count = 0;
+                bool phone_number_matched = 0;
+                bool carrier_matched = 0;
+                bool subscription_matched = 0;
                 cJSON_ArrayForEach(claim, claims)
                 {
                     cJSON *claim_values = cJSON_GetObjectItemCaseSensitive(claim, "values");
@@ -201,6 +224,7 @@ cJSON *MatchCredential(cJSON *credential, cJSON *credential_store)
                             break;
                         }
                     }
+                    bool match_claim = 0;
                     if (matched != 0 && curr_claim != NULL)
                     {
                         if (claim_values != NULL)
@@ -211,27 +235,43 @@ cJSON *MatchCredential(cJSON *credential, cJSON *credential_store)
                                 if (cJSON_Compare(v, cJSON_GetObjectItemCaseSensitive(curr_claim, "value"), cJSON_True))
                                 {
                                     printf("- claim value matched.\n");
-                                    ++matched_claim_count;
+                                    match_claim = 1;
                                     break;
                                 }
                             }
                         }
                         else
                         {
                             printf("- claim matched.\n");
-                            ++matched_claim_count;
+                            match_claim = 1;
                         }
                     } else {
                         printf("- claim did not match\n.");
                     }
+                    if (match_claim) 
+                    {
+                        if (cJSON_Compare(paths, phone_number_hint_paths, cJSON_True)) {
+                            phone_number_matched = 1;
+                        }
+                        else if (cJSON_Compare(paths, subscription_hint_paths, cJSON_True)) {
+                            subscription_matched = 1;
+                        }
+                        else if (cJSON_Compare(paths, carrier_hint_paths, cJSON_True)) {
+                            carrier_matched = 1;
+                        }
+                    }
                 }
                 cJSON_AddItemReferenceToObject(matched_credential, "matched_claim_names", matched_claim_names);
-                if (matched_claim_count == cJSON_GetArraySize(claims))
-                {
-                    printf("Cred matched.\n");
-                    cJSON_AddItemReferenceToArray(matched_credentials, matched_credential);
+                if (phone_number_matched){
+                    cJSON_AddItemReferenceToArray(phone_number_matched_candidates, matched_credential);
+                } else if (carrier_matched && subscription_matched) {
+                    cJSON_AddItemReferenceToArray(carrier_and_subscription_matched_candidates, matched_credential);
+                } else if (carrier_matched) {
+                    cJSON_AddItemReferenceToArray(carrier_matched_candidates, matched_credential);
+                } else if (subscription_matched) {
+                    cJSON_AddItemReferenceToArray(sub_matched_candidates, matched_credential);
                 } else {
-                    printf("Cred did not match. Matched claim count: %d, Expected match count: %d\n.", matched_claim_count, cJSON_GetArraySize(claims));
+                    cJSON_AddItemReferenceToArray(other_candidates, matched_credential);
                 }
             }
         }
@@ -255,6 +295,9 @@ cJSON *MatchCredential(cJSON *credential, cJSON *credential_store)
 
                 cJSON *claim;
                 cJSON *candidate_claims = cJSON_GetObjectItemCaseSensitive(candidate, "paths");
+                bool phone_number_matched = 0;
+                bool carrier_matched = 0;
+                bool subscription_matched = 0;
                 cJSON_ArrayForEach(claim, claims)
                 {
                     cJSON *claim_values = cJSON_GetObjectItemCaseSensitive(claim, "values");
@@ -276,6 +319,7 @@ cJSON *MatchCredential(cJSON *credential, cJSON *credential_store)
                             break;
                         }
                     }
+                    bool match_claim = 0;
                     if (matched != 0 && curr_claim != NULL)
                     {
                         if (claim_values != NULL)
@@ -285,14 +329,26 @@ cJSON *MatchCredential(cJSON *credential, cJSON *credential_store)
                             {
                                 if (cJSON_Compare(v, cJSON_GetObjectItemCaseSensitive(curr_claim, "value"), cJSON_True))
                                 {
-                                    cJSON_AddItemReferenceToObject(matched_claim_ids, claim_id, cJSON_CreateString("PLACEHOLDER"));
+                                    match_claim = 1;
                                     break;
                                 }
                             }
                         }
                         else
                         {
-                            cJSON_AddItemReferenceToObject(matched_claim_ids, claim_id, cJSON_CreateString("PLACEHOLDER"));
+                            match_claim = 1;
+                        }
+                    }
+                    if (match_claim) {
+                        cJSON_AddItemReferenceToObject(matched_claim_ids, claim_id, cJSON_CreateString("PLACEHOLDER"));
+                        if (cJSON_Compare(paths, phone_number_hint_paths, cJSON_True)) {
+                            phone_number_matched = 1;
+                        }
+                        else if (cJSON_Compare(paths, subscription_hint_paths, cJSON_True)) {
+                            subscription_matched = 1;
+                        }
+                        else if (cJSON_Compare(paths, carrier_hint_paths, cJSON_True)) {
+                            carrier_matched = 1;
                         }
                     }
                 }
@@ -317,8 +373,36 @@ cJSON *MatchCredential(cJSON *credential, cJSON *credential_store)
                         break;
                     }
                 }
+                if (phone_number_matched){
+                    cJSON_AddItemReferenceToArray(phone_number_matched_candidates, matched_credential);
+                } else if (carrier_matched && subscription_matched) {
+                    cJSON_AddItemReferenceToArray(carrier_and_subscription_matched_candidates, matched_credential);
+                } else if (carrier_matched) {
+                    cJSON_AddItemReferenceToArray(carrier_matched_candidates, matched_credential);
+                } else if (subscription_matched) {
+                    cJSON_AddItemReferenceToArray(sub_matched_candidates, matched_credential);
+                } else {
+                    cJSON_AddItemReferenceToArray(other_candidates, matched_credential);
+                }
             }
         }
+
+        cJSON *c;
+        cJSON_ArrayForEach(c, phone_number_matched_candidates) {
+            cJSON_AddItemReferenceToArray(matched_credentials, c);
+        }
+        cJSON_ArrayForEach(c, carrier_and_subscription_matched_candidates) {
+            cJSON_AddItemReferenceToArray(matched_credentials, c);
+        }
+        cJSON_ArrayForEach(c, carrier_matched_candidates) {
+            cJSON_AddItemReferenceToArray(matched_credentials, c);
+        }
+        cJSON_ArrayForEach(c, sub_matched_candidates) {
+            cJSON_AddItemReferenceToArray(matched_credentials, c);
+        }
+        cJSON_ArrayForEach(c, other_candidates) {
+            cJSON_AddItemReferenceToArray(matched_credentials, c);
+        }
     }
 
     return matched_credentials;
diff --git a/matcher/pnv/test/common.hpp b/matcher/pnv/test/common.hpp
@@ -36,4 +36,11 @@ struct TestCredmanState {
     static TestCredmanState& instance();
 };
 
+struct TestCredmanStateGuard {
+    ~TestCredmanStateGuard() {
+        TestCredmanState::instance().string_id_entries.clear();
+        TestCredmanState::instance().payment_entries.clear();
+    }
+};
+
 extern TestCredmanState testCredmanState;
diff --git a/matcher/pnv/test/data/request2.json b/matcher/pnv/test/data/request2.json
@@ -0,0 +1,52 @@
+{
+    "requests": [
+        {
+            "protocol": "openid4vp-v1-unsigned",
+            "data": {
+                "dcql_query": {
+                    "credentials": [
+                        {
+                            "claims": [
+                                {
+                                    "path": [
+                                        "subscription_hint"
+                                    ],
+                                    "values": [
+                                        2
+                                    ]
+                                },
+                                {
+                                    "path": [
+                                        "carrier_hint"
+                                    ],
+                                    "values": [
+                                        "310250"
+                                    ]
+                                },
+                                {
+                                    "path": [
+                                        "android_carrier_hint"
+                                    ],
+                                    "values": [
+                                        3
+                                    ]
+                                }
+                            ],
+                            "format": "dc-authorization+sd-jwt",
+                            "id": "aggregator1",
+                            "meta": {
+                                "credential_authorization_jwt": "eyJhbGciOiJFUzI1NiIsInR5cCI6Im9hdXRoLWF1dGh6LXJlcStqd3QiLCJ4NWMiOlsiTUlJQ3BUQ0NBa3VnQXdJQkFnSVVDOWZOSnBkVU1RWWRCbDFuaDgrUml0UndNRDh3Q2dZSUtvWkl6ajBFQXdJd2VERUxNQWtHQTFVRUJoTUNWVk14RXpBUkJnTlZCQWdNQ2tOaGJHbG1iM0p1YVdFeEZqQVVCZ05WQkFjTURVMXZkVzUwWVdsdUlGWnBaWGN4R3pBWkJnTlZCQW9NRWtWNFlXMXdiR1VnUVdkbmNtVm5ZWFJ2Y2pFZk1CMEdBMVVFQXd3V1pYaGhiWEJzWlMxaFoyZHlaV2RoZEc5eUxtUmxkakFlRncweU5UQTFNVEV5TWpRd01EVmFGdzB6TlRBME1qa3lNalF3TURWYU1IZ3hDekFKQmdOVkJBWVRBbFZUTVJNd0VRWURWUVFJREFwRFlXeHBabTl5Ym1saE1SWXdGQVlEVlFRSERBMU5iM1Z1ZEdGcGJpQldhV1YzTVJzd0dRWURWUVFLREJKRmVHRnRjR3hsSUVGblozSmxaMkYwYjNJeEh6QWRCZ05WQkFNTUZtVjRZVzF3YkdVdFlXZG5jbVZuWVhSdmNpNWtaWFl3V1RBVEJnY3Foa2pPUFFJQkJnZ3Foa2pPUFFNQkJ3TkNBQVJRcW5LTGw5U2g4dFcwM0h5aVBnOVRUcGlyQVg2V2haKzlJSWhVWFJGcDlxRFM0eW5YeG1GbjMzWk5nMTlQR1VzRWpxNGwzam9Penh2cHhqWDRoL1JlbzRHeU1JR3ZNQjBHQTFVZERnUVdCQlFBV1I5czRrWFRjeHJPeTFLSE12UldTSkg5YmpBZkJnTlZIU01FR0RBV2dCUUFXUjlzNGtYVGN4ck95MUtITXZSV1NKSDliakFQQmdOVkhSTUJBZjhFQlRBREFRSC9NQTRHQTFVZER3RUIvd1FFQXdJSGdEQXBCZ05WSFJJRUlqQWdoaDVvZEhSd2N6b3ZMMlY0WVcxd2JHVXRZV2RuY21WbllYUnZjaTVqYjIwd0lRWURWUjBSQkJvd0dJSVdaWGhoYlhCc1pTMWhaMmR5WldkaGRHOXlMbU52YlRBS0JnZ3Foa2pPUFFRREFnTklBREJGQWlCeERROUZiby9EUVRkbVNaS0NURUlHOXZma0JkWU5jVHcxUkkzT0k2L25KUUloQUw1NmU3YkVNOTlSTTFTUDAyd3gzbHhxZFZCWnhiVEhJcllCQkY3Y0FzYjMiXX0.eyJpc3MiOiAiZGNhZ2dyZWdhdG9yLmRldiIsICJub25jZSI6ICJrazQzSkthUHNjYWpqWHAzNGZSOHB1SGp0UE1yY09CMzJLNXdLTUQ1Q2J3IiwgImVuY3J5cHRlZF9yZXNwb25zZV9lbmNfdmFsdWVzX3N1cHBvcnRlZCI6IFsiQTEyOEdDTSJdLCAiandrcyI6IHsia2V5cyI6IFt7Imt0eSI6ICJFQyIsICJ1c2UiOiAiZW5jIiwgImFsZyI6ICJFQ0RILUVTIiwgImtpZCI6ICIxIiwgImNydiI6ICJQLTI1NiIsICJ4IjogIjl5TGgtNkJJQ1pMUWdKcGEzdl9FQS1ZbkIyU2FhV1BLWGZQWGNKa2EwMGciLCAieSI6ICJKNkRFWXV5SW90NDM0WG5WOE5GTWppb1cxLUFtSkVCRHdwTW9wRUt4WUdrIn1dfSwgImNvbnNlbnRfZGF0YSI6ICJleUpqYjI1elpXNTBYM1JsZUhRaU9pQWlVbWxrWlhJZ2NISnZZMlZ6YzJWeklIbHZkWElnY0dWeWMyOXVZV3dnWkdGMFlTQmhZMk52Y21ScGJtY2dkRzhnYjNWeUlIQnlhWFpoWTNrZ2NHOXNhV041SWl3Z0luQnZiR2xqZVY5c2FXNXJJam9nSW1oMGRIQnpPaTh2WkdWMlpXeHZjR1Z5TG1GdVpISnZhV1F1WTI5dEwybGtaVzUwYVhSNUwyUnBaMmwwWVd3dFkzSmxaR1Z1ZEdsaGJITXZZM0psWkdWdWRHbGhiQzEyWlhKcFptbGxjaUlzSUNKd2IyeHBZM2xmZEdWNGRDSTZJQ0pNWldGeWJpQmhZbTkxZENCd2NtbDJZV041SUhCdmJHbGplU0o5IiwgInN0YXRlIjogIm9wdGlvbmFsX3N0YXRlX3ZhbHVlIn0.w7_X5hLwjDxw26GguGjxuJnhxfcmqtbcCPiTobUrGpoFIvYWat9Luqi5r8ZTu_CIfC3rismGsYZH6ozNQwXgnw",
+                                "vct_values": [
+                                    "number-verification/device-phone-number/ts43"
+                                ]
+                            }
+                        }
+                    ]
+                },
+                "nonce": "kk43JKaPscajjXp34fR8puHjtPMrcOB32K5wKMD5Cbw",
+                "response_mode": "dc_api",
+                "response_type": "vp_token"
+            }
+        }
+    ]
+}
diff --git a/matcher/pnv/test/data/request3.json b/matcher/pnv/test/data/request3.json
@@ -0,0 +1,61 @@
+{
+    "requests": [
+        {
+            "protocol": "openid4vp-v1-unsigned",
+            "data": {
+                "dcql_query": {
+                    "credentials": [
+                        {
+                            "claims": [
+                                {
+                                    "path": [
+                                        "subscription_hint"
+                                    ],
+                                    "values": [
+                                        2
+                                    ]
+                                },
+                                {
+                                    "path": [
+                                        "carrier_hint"
+                                    ],
+                                    "values": [
+                                        "910250"
+                                    ]
+                                },
+                                {
+                                    "path": [
+                                        "android_carrier_hint"
+                                    ],
+                                    "values": [
+                                        3
+                                    ]
+                                },
+                                {
+                                    "path": [
+                                        "phone_number_hint"
+                                    ],
+                                    "values": [
+                                        "+17502157890",
+                                        "+16502157890"
+                                    ]
+                                }
+                            ],
+                            "format": "dc-authorization+sd-jwt",
+                            "id": "aggregator1",
+                            "meta": {
+                                "credential_authorization_jwt": "eyJhbGciOiJFUzI1NiIsInR5cCI6Im9hdXRoLWF1dGh6LXJlcStqd3QiLCJ4NWMiOlsiTUlJQ3BUQ0NBa3VnQXdJQkFnSVVDOWZOSnBkVU1RWWRCbDFuaDgrUml0UndNRDh3Q2dZSUtvWkl6ajBFQXdJd2VERUxNQWtHQTFVRUJoTUNWVk14RXpBUkJnTlZCQWdNQ2tOaGJHbG1iM0p1YVdFeEZqQVVCZ05WQkFjTURVMXZkVzUwWVdsdUlGWnBaWGN4R3pBWkJnTlZCQW9NRWtWNFlXMXdiR1VnUVdkbmNtVm5ZWFJ2Y2pFZk1CMEdBMVVFQXd3V1pYaGhiWEJzWlMxaFoyZHlaV2RoZEc5eUxtUmxkakFlRncweU5UQTFNVEV5TWpRd01EVmFGdzB6TlRBME1qa3lNalF3TURWYU1IZ3hDekFKQmdOVkJBWVRBbFZUTVJNd0VRWURWUVFJREFwRFlXeHBabTl5Ym1saE1SWXdGQVlEVlFRSERBMU5iM1Z1ZEdGcGJpQldhV1YzTVJzd0dRWURWUVFLREJKRmVHRnRjR3hsSUVGblozSmxaMkYwYjNJeEh6QWRCZ05WQkFNTUZtVjRZVzF3YkdVdFlXZG5jbVZuWVhSdmNpNWtaWFl3V1RBVEJnY3Foa2pPUFFJQkJnZ3Foa2pPUFFNQkJ3TkNBQVJRcW5LTGw5U2g4dFcwM0h5aVBnOVRUcGlyQVg2V2haKzlJSWhVWFJGcDlxRFM0eW5YeG1GbjMzWk5nMTlQR1VzRWpxNGwzam9Penh2cHhqWDRoL1JlbzRHeU1JR3ZNQjBHQTFVZERnUVdCQlFBV1I5czRrWFRjeHJPeTFLSE12UldTSkg5YmpBZkJnTlZIU01FR0RBV2dCUUFXUjlzNGtYVGN4ck95MUtITXZSV1NKSDliakFQQmdOVkhSTUJBZjhFQlRBREFRSC9NQTRHQTFVZER3RUIvd1FFQXdJSGdEQXBCZ05WSFJJRUlqQWdoaDVvZEhSd2N6b3ZMMlY0WVcxd2JHVXRZV2RuY21WbllYUnZjaTVqYjIwd0lRWURWUjBSQkJvd0dJSVdaWGhoYlhCc1pTMWhaMmR5WldkaGRHOXlMbU52YlRBS0JnZ3Foa2pPUFFRREFnTklBREJGQWlCeERROUZiby9EUVRkbVNaS0NURUlHOXZma0JkWU5jVHcxUkkzT0k2L25KUUloQUw1NmU3YkVNOTlSTTFTUDAyd3gzbHhxZFZCWnhiVEhJcllCQkY3Y0FzYjMiXX0.eyJpc3MiOiAiZGNhZ2dyZWdhdG9yLmRldiIsICJub25jZSI6ICJrazQzSkthUHNjYWpqWHAzNGZSOHB1SGp0UE1yY09CMzJLNXdLTUQ1Q2J3IiwgImVuY3J5cHRlZF9yZXNwb25zZV9lbmNfdmFsdWVzX3N1cHBvcnRlZCI6IFsiQTEyOEdDTSJdLCAiandrcyI6IHsia2V5cyI6IFt7Imt0eSI6ICJFQyIsICJ1c2UiOiAiZW5jIiwgImFsZyI6ICJFQ0RILUVTIiwgImtpZCI6ICIxIiwgImNydiI6ICJQLTI1NiIsICJ4IjogIjl5TGgtNkJJQ1pMUWdKcGEzdl9FQS1ZbkIyU2FhV1BLWGZQWGNKa2EwMGciLCAieSI6ICJKNkRFWXV5SW90NDM0WG5WOE5GTWppb1cxLUFtSkVCRHdwTW9wRUt4WUdrIn1dfSwgImNvbnNlbnRfZGF0YSI6ICJleUpqYjI1elpXNTBYM1JsZUhRaU9pQWlVbWxrWlhJZ2NISnZZMlZ6YzJWeklIbHZkWElnY0dWeWMyOXVZV3dnWkdGMFlTQmhZMk52Y21ScGJtY2dkRzhnYjNWeUlIQnlhWFpoWTNrZ2NHOXNhV041SWl3Z0luQnZiR2xqZVY5c2FXNXJJam9nSW1oMGRIQnpPaTh2WkdWMlpXeHZjR1Z5TG1GdVpISnZhV1F1WTI5dEwybGtaVzUwYVhSNUwyUnBaMmwwWVd3dFkzSmxaR1Z1ZEdsaGJITXZZM0psWkdWdWRHbGhiQzEyWlhKcFptbGxjaUlzSUNKd2IyeHBZM2xmZEdWNGRDSTZJQ0pNWldGeWJpQmhZbTkxZENCd2NtbDJZV041SUhCdmJHbGplU0o5IiwgInN0YXRlIjogIm9wdGlvbmFsX3N0YXRlX3ZhbHVlIn0.w7_X5hLwjDxw26GguGjxuJnhxfcmqtbcCPiTobUrGpoFIvYWat9Luqi5r8ZTu_CIfC3rismGsYZH6ozNQwXgnw",
+                                "vct_values": [
+                                    "number-verification/verify/ts43"
+                                ]
+                            }
+                        }
+                    ]
+                },
+                "nonce": "kk43JKaPscajjXp34fR8puHjtPMrcOB32K5wKMD5Cbw",
+                "response_mode": "dc_api",
+                "response_type": "vp_token"
+            }
+        }
+    ]
+}
diff --git a/matcher/pnv/test/openid4vp1_0_test.cpp b/matcher/pnv/test/openid4vp1_0_test.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`#include <stdio.h>`
`2`	`2`	`#include <string.h>`
	`3`	`+#include <stdbool.h>`
`3`	`4`
`4`	`5`	`#include "../base64.h"`
`5`	`6`	`#include "../dcql.h"`
`@@ -24,6 +25,13 @@ int AddAllClaims(cJSON matched_claim_names, cJSON candidate_paths)`
`24`	`25`	`return 0;`
`25`	`26`	`}`
`26`	`27`
	`28`	`+cJSON CreateSingleStringArrayJson(char string)`
	`29`	`+{`
	`30`	`+ cJSON *array = cJSON_CreateArray();`
	`31`	`+ cJSON_AddItemReferenceToArray(array, cJSON_CreateString(string));`
	`32`	`+ return array;`
	`33`	`+}`
	`34`	`+`
`27`	`35`	`cJSON MatchCredential(cJSON credential, cJSON *credential_store)`
`28`	`36`	`{`
`29`	`37`	`cJSON *matched_credentials = cJSON_CreateArray();`
`@@ -155,6 +163,19 @@ cJSON MatchCredential(cJSON credential, cJSON *credential_store)`
`155`	`163`	`}`
`156`	`164`	`else`
`157`	`165`	`{`
	`166`	`+ cJSON *matched_claim_paths = cJSON_CreateArray();`
	`167`	`+`
	`168`	`+ cJSON *phone_number_matched_candidates = cJSON_CreateArray();`
	`169`	`+ cJSON *carrier_and_subscription_matched_candidates = cJSON_CreateArray();`
	`170`	`+ cJSON *carrier_matched_candidates = cJSON_CreateArray();`
	`171`	`+ cJSON *sub_matched_candidates = cJSON_CreateArray();`
	`172`	`+ cJSON *other_candidates = cJSON_CreateArray();`
	`173`	`+`
	`174`	`+ cJSON *phone_number_hint_paths = CreateSingleStringArrayJson("phone_number_hint");`
	`175`	`+ cJSON *subscription_hint_paths = CreateSingleStringArrayJson("subscription_hint");`
	`176`	`+ cJSON *carrier_hint_paths = CreateSingleStringArrayJson("carrier_hint");`
	`177`	`+`
	`178`	`+`
`158`	`179`	`if (claim_sets == NULL)`
`159`	`180`	`{`
`160`	`181`	`printf("Matching based on provided claims\n");`
`@@ -176,7 +197,9 @@ cJSON MatchCredential(cJSON credential, cJSON *credential_store)`
`176`	`197`
`177`	`198`	`cJSON *claim;`
`178`	`199`	`cJSON *candidate_claims = cJSON_GetObjectItemCaseSensitive(candidate, "paths");`
`179`		`- int matched_claim_count = 0;`
	`200`	`+ bool phone_number_matched = 0;`
	`201`	`+ bool carrier_matched = 0;`
	`202`	`+ bool subscription_matched = 0;`
`180`	`203`	`cJSON_ArrayForEach(claim, claims)`
`181`	`204`	`{`
`182`	`205`	`cJSON *claim_values = cJSON_GetObjectItemCaseSensitive(claim, "values");`
`@@ -201,6 +224,7 @@ cJSON MatchCredential(cJSON credential, cJSON *credential_store)`
`201`	`224`	`break;`
`202`	`225`	`}`
`203`	`226`	`}`
	`227`	`+ bool match_claim = 0;`
`204`	`228`	`if (matched != 0 && curr_claim != NULL)`
`205`	`229`	`{`
`206`	`230`	`if (claim_values != NULL)`
`@@ -211,27 +235,43 @@ cJSON MatchCredential(cJSON credential, cJSON *credential_store)`
`211`	`235`	`if (cJSON_Compare(v, cJSON_GetObjectItemCaseSensitive(curr_claim, "value"), cJSON_True))`
`212`	`236`	`{`
`213`	`237`	`printf("- claim value matched.\n");`
`214`		`- ++matched_claim_count;`
	`238`	`+ match_claim = 1;`
`215`	`239`	`break;`
`216`	`240`	`}`
`217`	`241`	`}`
`218`	`242`	`}`
`219`	`243`	`else`
`220`	`244`	`{`
`221`	`245`	`printf("- claim matched.\n");`
`222`		`- ++matched_claim_count;`
	`246`	`+ match_claim = 1;`
`223`	`247`	`}`
`224`	`248`	`} else {`
`225`	`249`	`printf("- claim did not match\n.");`
`226`	`250`	`}`
	`251`	`+ if (match_claim)`
	`252`	`+ {`
	`253`	`+ if (cJSON_Compare(paths, phone_number_hint_paths, cJSON_True)) {`
	`254`	`+ phone_number_matched = 1;`
	`255`	`+ }`
	`256`	`+ else if (cJSON_Compare(paths, subscription_hint_paths, cJSON_True)) {`
	`257`	`+ subscription_matched = 1;`
	`258`	`+ }`
	`259`	`+ else if (cJSON_Compare(paths, carrier_hint_paths, cJSON_True)) {`
	`260`	`+ carrier_matched = 1;`
	`261`	`+ }`
	`262`	`+ }`
`227`	`263`	`}`
`228`	`264`	`cJSON_AddItemReferenceToObject(matched_credential, "matched_claim_names", matched_claim_names);`
`229`		`- if (matched_claim_count == cJSON_GetArraySize(claims))`
`230`		`- {`
`231`		`- printf("Cred matched.\n");`
`232`		`- cJSON_AddItemReferenceToArray(matched_credentials, matched_credential);`
	`265`	`+ if (phone_number_matched){`
	`266`	`+ cJSON_AddItemReferenceToArray(phone_number_matched_candidates, matched_credential);`
	`267`	`+ } else if (carrier_matched && subscription_matched) {`
	`268`	`+ cJSON_AddItemReferenceToArray(carrier_and_subscription_matched_candidates, matched_credential);`
	`269`	`+ } else if (carrier_matched) {`
	`270`	`+ cJSON_AddItemReferenceToArray(carrier_matched_candidates, matched_credential);`
	`271`	`+ } else if (subscription_matched) {`
	`272`	`+ cJSON_AddItemReferenceToArray(sub_matched_candidates, matched_credential);`
`233`	`273`	`} else {`
`234`		`- printf("Cred did not match. Matched claim count: %d, Expected match count: %d\n.", matched_claim_count, cJSON_GetArraySize(claims));`
	`274`	`+ cJSON_AddItemReferenceToArray(other_candidates, matched_credential);`
`235`	`275`	`}`
`236`	`276`	`}`
`237`	`277`	`}`
`@@ -255,6 +295,9 @@ cJSON MatchCredential(cJSON credential, cJSON *credential_store)`
`255`	`295`
`256`	`296`	`cJSON *claim;`
`257`	`297`	`cJSON *candidate_claims = cJSON_GetObjectItemCaseSensitive(candidate, "paths");`
	`298`	`+ bool phone_number_matched = 0;`
	`299`	`+ bool carrier_matched = 0;`
	`300`	`+ bool subscription_matched = 0;`
`258`	`301`	`cJSON_ArrayForEach(claim, claims)`
`259`	`302`	`{`
`260`	`303`	`cJSON *claim_values = cJSON_GetObjectItemCaseSensitive(claim, "values");`
`@@ -276,6 +319,7 @@ cJSON MatchCredential(cJSON credential, cJSON *credential_store)`
`276`	`319`	`break;`
`277`	`320`	`}`
`278`	`321`	`}`
	`322`	`+ bool match_claim = 0;`
`279`	`323`	`if (matched != 0 && curr_claim != NULL)`
`280`	`324`	`{`
`281`	`325`	`if (claim_values != NULL)`
`@@ -285,14 +329,26 @@ cJSON MatchCredential(cJSON credential, cJSON *credential_store)`
`285`	`329`	`{`
`286`	`330`	`if (cJSON_Compare(v, cJSON_GetObjectItemCaseSensitive(curr_claim, "value"), cJSON_True))`
`287`	`331`	`{`
`288`		`- cJSON_AddItemReferenceToObject(matched_claim_ids, claim_id, cJSON_CreateString("PLACEHOLDER"));`
	`332`	`+ match_claim = 1;`
`289`	`333`	`break;`
`290`	`334`	`}`
`291`	`335`	`}`
`292`	`336`	`}`
`293`	`337`	`else`
`294`	`338`	`{`
`295`		`- cJSON_AddItemReferenceToObject(matched_claim_ids, claim_id, cJSON_CreateString("PLACEHOLDER"));`
	`339`	`+ match_claim = 1;`
	`340`	`+ }`
	`341`	`+ }`
	`342`	`+ if (match_claim) {`
	`343`	`+ cJSON_AddItemReferenceToObject(matched_claim_ids, claim_id, cJSON_CreateString("PLACEHOLDER"));`
	`344`	`+ if (cJSON_Compare(paths, phone_number_hint_paths, cJSON_True)) {`
	`345`	`+ phone_number_matched = 1;`
	`346`	`+ }`
	`347`	`+ else if (cJSON_Compare(paths, subscription_hint_paths, cJSON_True)) {`
	`348`	`+ subscription_matched = 1;`
	`349`	`+ }`
	`350`	`+ else if (cJSON_Compare(paths, carrier_hint_paths, cJSON_True)) {`
	`351`	`+ carrier_matched = 1;`
`296`	`352`	`}`
`297`	`353`	`}`
`298`	`354`	`}`
`@@ -317,8 +373,36 @@ cJSON MatchCredential(cJSON credential, cJSON *credential_store)`
`317`	`373`	`break;`
`318`	`374`	`}`
`319`	`375`	`}`
	`376`	`+ if (phone_number_matched){`
	`377`	`+ cJSON_AddItemReferenceToArray(phone_number_matched_candidates, matched_credential);`
	`378`	`+ } else if (carrier_matched && subscription_matched) {`
	`379`	`+ cJSON_AddItemReferenceToArray(carrier_and_subscription_matched_candidates, matched_credential);`
	`380`	`+ } else if (carrier_matched) {`
	`381`	`+ cJSON_AddItemReferenceToArray(carrier_matched_candidates, matched_credential);`
	`382`	`+ } else if (subscription_matched) {`
	`383`	`+ cJSON_AddItemReferenceToArray(sub_matched_candidates, matched_credential);`
	`384`	`+ } else {`
	`385`	`+ cJSON_AddItemReferenceToArray(other_candidates, matched_credential);`
	`386`	`+ }`
`320`	`387`	`}`
`321`	`388`	`}`
	`389`	`+`
	`390`	`+ cJSON *c;`
	`391`	`+ cJSON_ArrayForEach(c, phone_number_matched_candidates) {`
	`392`	`+ cJSON_AddItemReferenceToArray(matched_credentials, c);`
	`393`	`+ }`
	`394`	`+ cJSON_ArrayForEach(c, carrier_and_subscription_matched_candidates) {`
	`395`	`+ cJSON_AddItemReferenceToArray(matched_credentials, c);`
	`396`	`+ }`
	`397`	`+ cJSON_ArrayForEach(c, carrier_matched_candidates) {`
	`398`	`+ cJSON_AddItemReferenceToArray(matched_credentials, c);`
	`399`	`+ }`
	`400`	`+ cJSON_ArrayForEach(c, sub_matched_candidates) {`
	`401`	`+ cJSON_AddItemReferenceToArray(matched_credentials, c);`
	`402`	`+ }`
	`403`	`+ cJSON_ArrayForEach(c, other_candidates) {`
	`404`	`+ cJSON_AddItemReferenceToArray(matched_credentials, c);`
	`405`	`+ }`
`322`	`406`	`}`
`323`	`407`
`324`	`408`	`return matched_credentials;`