mirrors/lpac
1
0
Fork 0
mirror of https://github.com/estkme-group/lpac synced 2024-09-17 14:30:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(euiccinfo): add euiccCiPKIdListFor{Verification,Signing} (#29)

Browse source 
* feat(euiccinfo): add euiccCiPKIdListFor{Verification,Signing}

According to RFC3280 section 4.2.1.2, SubjectKeyIdentifier is byte array of
SHA-1 or subset of SHA-1, so we print it as HEX string, just as InfiLPA does.

Ref: https://datatracker.ietf.org/doc/html/rfc3280#section-4.2.1.2

Signed-off-by: Coelacanthus <CoelacanthusHex@gmail.com>

* fix: use euicc_hexutil_bin2hex() from hexutil.h

Signed-off-by: Coelacanthus <CoelacanthusHex@gmail.com>

* fix: add null check for euiccCiPKListFor*

Signed-off-by: Coelacanthus <CoelacanthusHex@gmail.com>

* fix: add es10cex_free_euiccinfo2 function and use it in applet/chip/info

Change type of euiccinfo2 in applet/chip/info.c from struct to pointer
to implement better euiccinfo release.

Signed-off-by: Coelacanthus <CoelacanthusHex@gmail.com>

* chore: use Allman style indentation to match project style

Hope lpac can have a .clang-format file to specify project code style.

Signed-off-by: Coelacanthus <CoelacanthusHex@gmail.com>

* fix(applet/chip/info): fix euiccinfo2 init value

Signed-off-by: Coelacanthus <CoelacanthusHex@gmail.com>

* refactor: use NULL-terminated array to store variable length array

Signed-off-by: Coelacanthus <CoelacanthusHex@gmail.com>

* refactor(applet/chip/info): alloc euiccinfo2 on stack

Signed-off-by: Coelacanthus <CoelacanthusHex@gmail.com>

* fix: should increse pointer after use it

Signed-off-by: Coelacanthus <CoelacanthusHex@gmail.com>

---------

Signed-off-by: Coelacanthus <CoelacanthusHex@gmail.com>
This commit is contained in:
Coelacanthus 2024-01-04 10:38:23 +08:00 committed by GitHub
parent 76baec728a
commit d36479e9b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 80 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
euicc/es10cex.c
View file

@ -9,6 +9,7 @@
#include "asn1c/asn1/GetEuiccInfo2Request.h"
#include "asn1c/asn1/EUICCInfo2.h"
#include "euicc/hexutil.h"
static int _versiontype_to_string(char *out, int out_len, VersionType_t version)
{
@ -95,6 +96,26 @@ int es10cex_get_euiccinfo2(struct euicc_ctx *ctx, struct es10cex_euiccinfo2 *inf
_versiontype_to_string(info->global_platform_version, sizeof(info->global_platform_version),
*asn1resp->globalplatformVersion);
}
if (asn1resp->euiccCiPKIdListForVerification.list.count)
{
info->euicc_ci_public_key_id_list_for_verification = (char **)malloc(sizeof(char*) * (asn1resp->euiccCiPKIdListForVerification.list.count + 1));
for (int i = 0; i < asn1resp->euiccCiPKIdListForVerification.list.count; i++)
{
euicc_hexutil_bin2hex(info->euicc_ci_public_key_id_list_for_verification[i], asn1resp->euiccCiPKIdListForVerification.list.array[i]->size * 2 + 1,
asn1resp->euiccCiPKIdListForVerification.list.array[i]->buf, asn1resp->euiccCiPKIdListForVerification.list.array[i]->size);
}
info->euicc_ci_public_key_id_list_for_verification[asn1resp->euiccCiPKIdListForVerification.list.count] = NULL;
}
if (asn1resp->euiccCiPKIdListForSigning.list.count)
{
info->euicc_ci_public_key_id_list_for_signing = (char **)malloc(sizeof(char*) * (asn1resp->euiccCiPKIdListForSigning.list.count + 1));
for (int i = 0; i < asn1resp->euiccCiPKIdListForSigning.list.count; i++)
{
euicc_hexutil_bin2hex(info->euicc_ci_public_key_id_list_for_signing[i], asn1resp->euiccCiPKIdListForSigning.list.array[i]->size * 2 + 1,
asn1resp->euiccCiPKIdListForSigning.list.array[i]->buf, asn1resp->euiccCiPKIdListForSigning.list.array[i]->size);
}
info->euicc_ci_public_key_id_list_for_signing[asn1resp->euiccCiPKIdListForSigning.list.count] = NULL;
}
memcpy(info->sas_accreditation_number, asn1resp->sasAcreditationNumber.buf,
asn1resp->sasAcreditationNumber.size);
@ -111,3 +132,26 @@ exit:
return fret;
}
int es10cex_free_euiccinfo2(struct es10cex_euiccinfo2 *info)
{
if (info->euicc_ci_public_key_id_list_for_verification)
{
char **p = info->euicc_ci_public_key_id_list_for_verification;
while (*p)
{
free(*p++);
}
free(info->euicc_ci_public_key_id_list_for_verification);
}
if (info->euicc_ci_public_key_id_list_for_signing)
{
char **p = info->euicc_ci_public_key_id_list_for_signing;
while (*p)
{
free(*p++);
}
free(info->euicc_ci_public_key_id_list_for_signing);
}
free(info);
}

3
euicc/es10cex.h
View file

@ -9,6 +9,8 @@ struct es10cex_euiccinfo2
char euicc_firmware_version[16];
char uicc_firmware_version[16];
char global_platform_version[16];
char **euicc_ci_public_key_id_list_for_verification;
char **euicc_ci_public_key_id_list_for_signing;
char sas_accreditation_number[65];
char pp_version[16];
int free_nvram;
@ -16,3 +18,4 @@ struct es10cex_euiccinfo2
};
int es10cex_get_euiccinfo2(struct euicc_ctx *ctx, struct es10cex_euiccinfo2 *info);
int es10cex_free_euiccinfo2(struct es10cex_euiccinfo2 *info);

33
src/applet/chip/info.c
View file

@ -1,4 +1,5 @@
#include "info.h"
#include "cjson/cJSON.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@ -46,6 +47,38 @@ static int applet_main(int argc, char **argv)
cJSON_AddStringOrNullToObject(jeuiccinfo2, "sas_accreditation_number", euiccinfo2.sas_accreditation_number);
cJSON_AddNumberToObject(jeuiccinfo2, "free_nvram", euiccinfo2.free_nvram);
cJSON_AddNumberToObject(jeuiccinfo2, "free_ram", euiccinfo2.free_ram);
if (euiccinfo2.euicc_ci_public_key_id_list_for_verification)
{
cJSON *a = cJSON_CreateArray();
char **p = euiccinfo2.euicc_ci_public_key_id_list_for_verification;
while (*p)
{
cJSON_AddItemToArray(a, cJSON_CreateString(*p));
free(*p++);
}
cJSON_AddItemToObject(jeuiccinfo2, "euicc_ci_public_key_id_list_for_verification", a);
free(euiccinfo2.euicc_ci_public_key_id_list_for_verification);
}
else
{
cJSON_AddNullToObject(jeuiccinfo2, "euicc_ci_public_key_id_list_for_verification");
}
if (euiccinfo2.euicc_ci_public_key_id_list_for_signing)
{
cJSON *a = cJSON_CreateArray();
char **p = euiccinfo2.euicc_ci_public_key_id_list_for_signing;
while (*p)
{
cJSON_AddItemToArray(a, cJSON_CreateString(*p));
free(*p++);
}
cJSON_AddItemToObject(jeuiccinfo2, "euicc_ci_public_key_id_list_for_signing", a);
free(euiccinfo2.euicc_ci_public_key_id_list_for_signing);
}
else
{
cJSON_AddNullToObject(jeuiccinfo2, "euicc_ci_public_key_id_list_for_signing");
}
}
cJSON_AddItemToObject(jdata, "euiccinfo2", jeuiccinfo2);