james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

check the new key before setting it

Browse Source
This commit is contained in:
Klas Lindfors
2014-02-08 15:07:20 +01:00
parent aa25c6fc16
commit f2c7fb4497
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yubico-piv-tool.c
+12 -1
View File
@@ -423,8 +423,19 @@ static bool set_mgm_key(SCARDHANDLE *card, unsigned const char *new_key, int ver
unsigned char data[0xff]; unsigned char data[0xff];
unsigned long recv_len = sizeof(data); unsigned long recv_len = sizeof(data);
int sw; int sw;
size_t i;
for(i = 0; i < KEY_LEN; i += 8) {
const_DES_cblock key_tmp;
memcpy(key_tmp, new_key + i, 8);
if(DES_is_weak_key(&key_tmp) == 1) {
fprintf(stderr, "Won't set new key '");
dump_hex(new_key + i, 8);
fprintf(stderr, "' since it's considered weak.\n");
return false;
}
}
/* TODO: check that it's a good key before setting. */
memset(apdu.raw, 0, sizeof(apdu)); memset(apdu.raw, 0, sizeof(apdu));
apdu.st.ins = 0xff; apdu.st.ins = 0xff;
apdu.st.p1 = 0xff; apdu.st.p1 = 0xff;