dearsky/pico-hsm
1
0
Fork 0
Code Issues 17 Pull Requests 4 Actions Packages Projects Releases 26 Wiki Activity

Fix OID names.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2022-08-18 11:58:05 +02:00
parent 538b39386b
commit 4e01a78286
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/hsm/cvc.c
View File

@@ -509,15 +509,15 @@ int puk_verify(const uint8_t *sig, size_t sig_len, const uint8_t *hash, size_t h
} }
else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC
mbedtls_md_type_t md = MBEDTLS_MD_NONE; mbedtls_md_type_t md = MBEDTLS_MD_NONE;
if (memcmp(oid, OID_IT_TA_ECDSA_SHA_1, oid_len) == 0) if (memcmp(oid, OID_ID_TA_ECDSA_SHA_1, oid_len) == 0)
md = MBEDTLS_MD_SHA1; md = MBEDTLS_MD_SHA1;
else if (memcmp(oid, OID_IT_TA_ECDSA_SHA_224, oid_len) == 0) else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_224, oid_len) == 0)
md = MBEDTLS_MD_SHA224; md = MBEDTLS_MD_SHA224;
else if (memcmp(oid, OID_IT_TA_ECDSA_SHA_256, oid_len) == 0) else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, oid_len) == 0)
md = MBEDTLS_MD_SHA256; md = MBEDTLS_MD_SHA256;
else if (memcmp(oid, OID_IT_TA_ECDSA_SHA_384, oid_len) == 0) else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_384, oid_len) == 0)
md = MBEDTLS_MD_SHA384; md = MBEDTLS_MD_SHA384;
else if (memcmp(oid, OID_IT_TA_ECDSA_SHA_512, oid_len) == 0) else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_512, oid_len) == 0)
md = MBEDTLS_MD_SHA512; md = MBEDTLS_MD_SHA512;
if (md == MBEDTLS_MD_NONE) if (md == MBEDTLS_MD_NONE)
return CCID_WRONG_DATA; return CCID_WRONG_DATA;
@@ -604,15 +604,15 @@ int cvc_verify(const uint8_t *cert, size_t cert_len, const uint8_t *ca, size_t c
md = MBEDTLS_MD_SHA512; md = MBEDTLS_MD_SHA512;
} }
else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC else if (memcmp(oid, OID_ID_TA_ECDSA, 9) == 0) { //ECC
if (memcmp(oid, OID_IT_TA_ECDSA_SHA_1, oid_len) == 0) if (memcmp(oid, OID_ID_TA_ECDSA_SHA_1, oid_len) == 0)
md = MBEDTLS_MD_SHA1; md = MBEDTLS_MD_SHA1;
else if (memcmp(oid, OID_IT_TA_ECDSA_SHA_224, oid_len) == 0) else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_224, oid_len) == 0)
md = MBEDTLS_MD_SHA224; md = MBEDTLS_MD_SHA224;
else if (memcmp(oid, OID_IT_TA_ECDSA_SHA_256, oid_len) == 0) else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, oid_len) == 0)
md = MBEDTLS_MD_SHA256; md = MBEDTLS_MD_SHA256;
else if (memcmp(oid, OID_IT_TA_ECDSA_SHA_384, oid_len) == 0) else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_384, oid_len) == 0)
md = MBEDTLS_MD_SHA384; md = MBEDTLS_MD_SHA384;
else if (memcmp(oid, OID_IT_TA_ECDSA_SHA_512, oid_len) == 0) else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_512, oid_len) == 0)
md = MBEDTLS_MD_SHA512; md = MBEDTLS_MD_SHA512;
} }
if (md == MBEDTLS_MD_NONE) if (md == MBEDTLS_MD_NONE)

10
src/hsm/oid.h
View File

@@ -56,11 +56,11 @@
#define OID_ID_TA_ECDSA OID_ID_TA "\x02" #define OID_ID_TA_ECDSA OID_ID_TA "\x02"
#define OID_IT_TA_ECDSA_SHA_1 OID_ID_TA_ECDSA "\x01" #define OID_ID_TA_ECDSA_SHA_1 OID_ID_TA_ECDSA "\x01"
#define OID_IT_TA_ECDSA_SHA_224 OID_ID_TA_ECDSA "\x02" #define OID_ID_TA_ECDSA_SHA_224 OID_ID_TA_ECDSA "\x02"
#define OID_IT_TA_ECDSA_SHA_256 OID_ID_TA_ECDSA "\x03" #define OID_ID_TA_ECDSA_SHA_256 OID_ID_TA_ECDSA "\x03"
#define OID_IT_TA_ECDSA_SHA_384 OID_ID_TA_ECDSA "\x04" #define OID_ID_TA_ECDSA_SHA_384 OID_ID_TA_ECDSA "\x04"
#define OID_IT_TA_ECDSA_SHA_512 OID_ID_TA_ECDSA "\x05" #define OID_ID_TA_ECDSA_SHA_512 OID_ID_TA_ECDSA "\x05"
#define OID_ID_RI OID_BSI_DE "\x02\x02\x05" #define OID_ID_RI OID_BSI_DE "\x02\x02\x05"