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

use DES_set_key_checked() instead of DES_is_weak_key()

Browse Source 
since DES_set_key_checked() checks the parity as well
This commit is contained in:
Klas Lindfors
2015-02-02 10:26:25 +01:00
parent f24b1d0c46
commit dca651070d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ykpiv.c
+5 -2
View File
@@ -420,12 +420,15 @@ ykpiv_rc ykpiv_set_mgmkey(ykpiv_state *state, const unsigned char *new_key) {
for(i = 0; i < 3; i++) { for(i = 0; i < 3; i++) {
const_DES_cblock key_tmp; const_DES_cblock key_tmp;
DES_key_schedule ks_tmp;
int ret;
memcpy(key_tmp, new_key + i * 8, 8); memcpy(key_tmp, new_key + i * 8, 8);
if(DES_is_weak_key(&key_tmp) == 1) { ret = DES_set_key_checked(&key_tmp, &ks_tmp);
if(ret != 0) {
if(state->verbose) { if(state->verbose) {
fprintf(stderr, "Won't set new key '"); fprintf(stderr, "Won't set new key '");
dump_hex(new_key + i * 8, 8); dump_hex(new_key + i * 8, 8);
fprintf(stderr, "' since it's considered weak.\n"); fprintf(stderr, "' since it's %s.\n", ret == -1 ? "got odd parity" : "weak");
} }
return YKPIV_GENERIC_ERROR; return YKPIV_GENERIC_ERROR;
} }