asn1: Use name not gen_name for JSON enum printing
This commit is contained in:
@@ -193,23 +193,23 @@ In recent times the following features have been added:
|
||||
{
|
||||
"_type": "TPMSpecification",
|
||||
"family": "2.0",
|
||||
"level": "0",
|
||||
"revision": "138"
|
||||
"level": 0,
|
||||
"revision": 138
|
||||
}
|
||||
]
|
||||
[
|
||||
{
|
||||
"_type": "TPMSecurityAssertions",
|
||||
"version": "0",
|
||||
"version": 0,
|
||||
"fieldUpgradable": true,
|
||||
"ekGenerationType": "655617",
|
||||
"ekGenerationLocation": "655616",
|
||||
"ekCertificateGenerationLocation": "655616",
|
||||
"ekGenerationType": "ekgt-injected",
|
||||
"ekGenerationLocation": "tpmManufacturer",
|
||||
"ekCertificateGenerationLocation": "tpmManufacturer",
|
||||
"ccInfo": {
|
||||
"_type": "CommonCriteriaMeasures",
|
||||
"version": "3.1",
|
||||
"assurancelevel": "4",
|
||||
"evaluationStatus": "2",
|
||||
"assurancelevel": "ealevel4",
|
||||
"evaluationStatus": "evaluationCompleted",
|
||||
"plus": true,
|
||||
"strengthOfFunction": null,
|
||||
"profileOid": null,
|
||||
@@ -220,7 +220,7 @@ In recent times the following features have been added:
|
||||
"fipsLevel": {
|
||||
"_type": "FIPSLevel",
|
||||
"version": "140-2",
|
||||
"level": "2",
|
||||
"level": "sllevel2",
|
||||
"plus": false
|
||||
},
|
||||
"iso9000Certified": false,
|
||||
@@ -602,7 +602,7 @@ In recent times the following features have been added:
|
||||
"_type": "TPMSecurityAssertions",
|
||||
"version": 0,
|
||||
"fieldUpgradable": true,
|
||||
"ekGenerationType": "ekgt_injected",
|
||||
"ekGenerationType": "ekgt-injected",
|
||||
"ekGenerationLocation": "tpmManufacturer",
|
||||
"ekCertificateGenerationLocation": "tpmManufacturer",
|
||||
"ccInfo": {
|
||||
|
@@ -2296,7 +2296,7 @@ test_ios(void)
|
||||
"101FFA0030A0101A1030A0100A2030A0100A310300E1603332E310A01040A010"
|
||||
"20101FFA40F300D16053134302D320A0102010100\"],\"_values_choice\":\"\","
|
||||
"\"_values\":[{\"_type\":\"TPMSecurityAssertions\",\"version\":0,\"fieldUp"
|
||||
"gradable\":true,\"ekGenerationType\":\"ekgt_injected\",\"ekGenerationL"
|
||||
"gradable\":true,\"ekGenerationType\":\"ekgt-injected\",\"ekGenerationL"
|
||||
"ocation\":\"tpmManufacturer\",\"ekCertificateGenerationLocation\":\"tp"
|
||||
"mManufacturer\",\"ccInfo\":{\"_type\":\"CommonCriteriaMeasures\",\"versi"
|
||||
"on\":\"3.1\",\"assurancelevel\":\"ealevel4\",\"evaluationStatus\":\"evalua"
|
||||
|
@@ -960,7 +960,7 @@ template_members(struct templatehead *temp,
|
||||
if (m->val > UINT32_MAX)
|
||||
continue; /* Wouldn't fit in the offset field */
|
||||
add_line(&tl->template,
|
||||
"{ A1_OP_NAME, %d, \"%s\" }", m->val, m->gen_name);
|
||||
"{ A1_OP_NAME, %d, \"%s\" }", m->val, m->name);
|
||||
nmemb++;
|
||||
}
|
||||
tlist_header(tl, "{ 0, 0, ((void *)%lu) }", nmemb);
|
||||
|
Reference in New Issue
Block a user