Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delete hotp secret before setting it. #28

Merged
merged 1 commit into from
Dec 20, 2023
Merged

Delete hotp secret before setting it. #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion src/operations_ccid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,36 @@ int authenticate_ccid(struct Device *dev, const char *admin_PIN) {
return RET_NO_ERROR;
}

int delete_secret_on_device_ccid(struct Device *dev) {
TLV tlvs[] = {
{
.tag = Tag_CredentialId,
.length = SLOT_NAME_LEN,
.type = 'S',
.v_str = SLOT_NAME,
}
};

clean_buffers(dev);
// encode
uint32_t icc_actual_length = icc_pack_tlvs_for_sending(dev->ccid_buffer_out, sizeof dev->ccid_buffer_out,
tlvs, ARR_LEN(tlvs), Ins_Delete);
// send
IccResult iccResult;
int r = ccid_process_single(dev->mp_devhandle_ccid, dev->ccid_buffer_in, sizeof dev->ccid_buffer_in,
dev->ccid_buffer_out, icc_actual_length, &iccResult);
if (r != 0) {
return r;
}

// check status code
if (iccResult.data_status_code == 0x6a82 || iccResult.data_status_code == 0x9000) {
return 0;
} else {
return RET_VALIDATION_FAILED;
}
return r;
}

int set_secret_on_device_ccid(struct Device *dev, const char *OTP_secret_base32, const uint64_t hotp_counter) {
// Decode base32 secret
Expand All @@ -115,6 +145,11 @@ int set_secret_on_device_ccid(struct Device *dev, const char *OTP_secret_base32,
rassert(hotp_counter < 0xFFFFFFFF);
uint32_t initial_counter_value = hotp_counter;

int r = delete_secret_on_device_ccid(dev);
if (r != 0) {
return r;
}

TLV tlvs[] = {
{
.tag = Tag_CredentialId,
Expand Down Expand Up @@ -150,7 +185,7 @@ int set_secret_on_device_ccid(struct Device *dev, const char *OTP_secret_base32,

// send
IccResult iccResult;
int r = ccid_process_single(dev->mp_devhandle_ccid, dev->ccid_buffer_in, sizeof dev->ccid_buffer_in,
r = ccid_process_single(dev->mp_devhandle_ccid, dev->ccid_buffer_in, sizeof dev->ccid_buffer_in,
dev->ccid_buffer_out, icc_actual_length, &iccResult);


Expand Down