Added support for building emulation in Windows.
It has not been tested but it should not break any linux build. Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
@@ -31,29 +31,29 @@ int cmd_keypair_gen() {
|
||||
}
|
||||
int ret = 0;
|
||||
|
||||
size_t tout = 0;
|
||||
uint16_t tout = 0;
|
||||
//sc_asn1_print_tags(apdu.data, apdu.nc);
|
||||
uint8_t *p = NULL;
|
||||
//DEBUG_DATA(apdu.data,apdu.nc);
|
||||
if (asn1_find_tag(apdu.data, apdu.nc, 0x7f49, &tout, &p) && tout > 0 && p != NULL) {
|
||||
size_t oid_len = 0;
|
||||
if (asn1_find_tag(apdu.data, (uint16_t)apdu.nc, 0x7f49, &tout, &p) && tout > 0 && p != NULL) {
|
||||
uint16_t oid_len = 0;
|
||||
uint8_t *oid = NULL;
|
||||
if (asn1_find_tag(p, tout, 0x6, &oid_len, &oid) && oid_len > 0 && oid != NULL) {
|
||||
if (memcmp(oid, OID_ID_TA_RSA_V1_5_SHA_256, oid_len) == 0) { //RSA
|
||||
size_t ex_len = 3, ks_len = 2;
|
||||
uint16_t ex_len = 3, ks_len = 2;
|
||||
uint8_t *ex = NULL, *ks = NULL;
|
||||
uint32_t exponent = 65537, key_size = 2048;
|
||||
if (asn1_find_tag(p, tout, 0x82, &ex_len, &ex) && ex_len > 0 && ex != NULL) {
|
||||
uint8_t *dt = ex;
|
||||
exponent = 0;
|
||||
for (int i = 0; i < ex_len; i++) {
|
||||
for (uint16_t i = 0; i < ex_len; i++) {
|
||||
exponent = (exponent << 8) | *dt++;
|
||||
}
|
||||
}
|
||||
if (asn1_find_tag(p, tout, 0x2, &ks_len, &ks) && ks_len > 0 && ks != NULL) {
|
||||
uint8_t *dt = ks;
|
||||
key_size = 0;
|
||||
for (int i = 0; i < ks_len; i++) {
|
||||
for (uint16_t i = 0; i < ks_len; i++) {
|
||||
key_size = (key_size << 8) | *dt++;
|
||||
}
|
||||
}
|
||||
@@ -69,7 +69,7 @@ int cmd_keypair_gen() {
|
||||
return SW_EXEC_ERROR();
|
||||
}
|
||||
if ((res_APDU_size =
|
||||
asn1_cvc_aut(&rsa, PICO_KEYS_KEY_RSA, res_APDU, 4096, NULL, 0)) == 0) {
|
||||
(uint16_t)asn1_cvc_aut(&rsa, PICO_KEYS_KEY_RSA, res_APDU, 4096, NULL, 0)) == 0) {
|
||||
return SW_EXEC_ERROR();
|
||||
}
|
||||
ret = store_keys(&rsa, PICO_KEYS_KEY_RSA, key_id);
|
||||
@@ -80,7 +80,7 @@ int cmd_keypair_gen() {
|
||||
mbedtls_rsa_free(&rsa);
|
||||
}
|
||||
else if (memcmp(oid, OID_ID_TA_ECDSA_SHA_256, MIN(oid_len, 10)) == 0) { //ECC
|
||||
size_t prime_len;
|
||||
uint16_t prime_len;
|
||||
uint8_t *prime = NULL;
|
||||
if (asn1_find_tag(p, tout, 0x81, &prime_len, &prime) != true) {
|
||||
return SW_WRONG_DATA();
|
||||
@@ -98,14 +98,14 @@ int cmd_keypair_gen() {
|
||||
mbedtls_ecdsa_free(&ecdsa);
|
||||
return SW_EXEC_ERROR();
|
||||
}
|
||||
size_t l91 = 0, ext_len = 0;
|
||||
uint16_t l91 = 0, ext_len = 0;
|
||||
uint8_t *p91 = NULL, *ext = NULL;
|
||||
if (asn1_find_tag(apdu.data, apdu.nc, 0x91, &l91, &p91) && p91 != NULL && l91 > 0) {
|
||||
for (int n = 0; n < l91; n++) {
|
||||
if (asn1_find_tag(apdu.data, (uint16_t)apdu.nc, 0x91, &l91, &p91) && p91 != NULL && l91 > 0) {
|
||||
for (size_t n = 0; n < l91; n++) {
|
||||
if (p91[n] == ALGO_EC_DH_XKEK) {
|
||||
size_t l92 = 0;
|
||||
uint16_t l92 = 0;
|
||||
uint8_t *p92 = NULL;
|
||||
if (!asn1_find_tag(apdu.data, apdu.nc, 0x92, &l92,
|
||||
if (!asn1_find_tag(apdu.data, (uint16_t)apdu.nc, 0x92, &l92,
|
||||
&p92) || p92 == NULL || l92 == 0) {
|
||||
return SW_WRONG_DATA();
|
||||
}
|
||||
@@ -116,24 +116,24 @@ int cmd_keypair_gen() {
|
||||
if (!tf_xkek) {
|
||||
return SW_WRONG_DATA();
|
||||
}
|
||||
ext_len = 2 + 2 + strlen(OID_ID_KEY_DOMAIN_UID) + 2 + file_get_size(
|
||||
ext_len = 2 + 2 + (uint16_t)strlen(OID_ID_KEY_DOMAIN_UID) + 2 + file_get_size(
|
||||
tf_xkek);
|
||||
ext = (uint8_t *) calloc(1, ext_len);
|
||||
uint8_t *pe = ext;
|
||||
*pe++ = 0x73;
|
||||
*pe++ = ext_len - 2;
|
||||
*pe++ = (uint8_t)ext_len - 2;
|
||||
*pe++ = 0x6;
|
||||
*pe++ = strlen(OID_ID_KEY_DOMAIN_UID);
|
||||
*pe++ = (uint8_t)strlen(OID_ID_KEY_DOMAIN_UID);
|
||||
memcpy(pe, OID_ID_KEY_DOMAIN_UID, strlen(OID_ID_KEY_DOMAIN_UID));
|
||||
pe += strlen(OID_ID_KEY_DOMAIN_UID);
|
||||
*pe++ = 0x80;
|
||||
*pe++ = file_get_size(tf_xkek);
|
||||
*pe++ = (uint8_t)file_get_size(tf_xkek);
|
||||
memcpy(pe, file_get_data(tf_xkek), file_get_size(tf_xkek));
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((res_APDU_size =
|
||||
asn1_cvc_aut(&ecdsa, PICO_KEYS_KEY_EC, res_APDU, 4096, ext, ext_len)) == 0) {
|
||||
(uint16_t)asn1_cvc_aut(&ecdsa, PICO_KEYS_KEY_EC, res_APDU, 4096, ext, ext_len)) == 0) {
|
||||
if (ext) {
|
||||
free(ext);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user