From 4e01a78286656d4558ce082d001d6869af9646d4 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Thu, 18 Aug 2022 11:58:05 +0200 Subject: [PATCH] Fix OID names. Signed-off-by: Pol Henarejos --- src/hsm/cvc.c | 20 ++++++++++---------- src/hsm/oid.h | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/hsm/cvc.c b/src/hsm/cvc.c index 57c07e8..7324f31 100644 --- a/src/hsm/cvc.c +++ b/src/hsm/cvc.c @@ -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 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; - 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; - 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; - 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; - 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; if (md == MBEDTLS_MD_NONE) 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; } 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; - 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; - 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; - 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; - 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; } if (md == MBEDTLS_MD_NONE) diff --git a/src/hsm/oid.h b/src/hsm/oid.h index 5c2a4ae..e758f7c 100644 --- a/src/hsm/oid.h +++ b/src/hsm/oid.h @@ -56,11 +56,11 @@ #define OID_ID_TA_ECDSA OID_ID_TA "\x02" -#define OID_IT_TA_ECDSA_SHA_1 OID_ID_TA_ECDSA "\x01" -#define OID_IT_TA_ECDSA_SHA_224 OID_ID_TA_ECDSA "\x02" -#define OID_IT_TA_ECDSA_SHA_256 OID_ID_TA_ECDSA "\x03" -#define OID_IT_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_1 OID_ID_TA_ECDSA "\x01" +#define OID_ID_TA_ECDSA_SHA_224 OID_ID_TA_ECDSA "\x02" +#define OID_ID_TA_ECDSA_SHA_256 OID_ID_TA_ECDSA "\x03" +#define OID_ID_TA_ECDSA_SHA_384 OID_ID_TA_ECDSA "\x04" +#define OID_ID_TA_ECDSA_SHA_512 OID_ID_TA_ECDSA "\x05" #define OID_ID_RI OID_BSI_DE "\x02\x02\x05"