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

Jump to bottom

update fips token support #3081

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

update fips token support #3081

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b9c925b
Update card-epass2003.c
haijie-ftsafe Sep 13, 2023
1f54a71
Merge branch 'OpenSC:master' into master
haijie-ftsafe Mar 21, 2024
40ca329
Update card-epass2003.c
haijie-ftsafe Mar 21, 2024
7266daf
Update card-epass2003.c
haijie-ftsafe Mar 21, 2024
fd7c1db
Update src/libopensc/card-epass2003.c
haijie-ftsafe Mar 21, 2024
c5ec42e
Update src/libopensc/card-epass2003.c
haijie-ftsafe Mar 21, 2024
901f270
Update card-epass2003.c
haijie-ftsafe Mar 21, 2024
361454e
Merge branch 'OpenSC:master' into master
haijie-ftsafe Mar 25, 2024
52e312a
Update card-epass2003.c
haijie-ftsafe Mar 25, 2024
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
Prev Previous commit
Next Next commit
Update card-epass2003.c 
modified logical judgement
  • Loading branch information
@haijie-ftsafe
haijie-ftsafe committed Mar 21, 2024
commit 901f270abbd399743e1cb6a2fa2d6b6b1b89253e
20 changes: 13 additions & 7 deletions src/libopensc/card-epass2003.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ aes128_encrypt_cmac_ft(struct sc_card *card, const unsigned char *key, int keysi
EVP_CIPHER *alg = sc_evp_cipher(card->ctx, "AES-128-ECB");
r = openssl_enc(alg, key, iv0, data1, 16, out);
if (r != SC_SUCCESS) {
sc_log_openssl(card->ctx);
sc_evp_cipher_free(alg);
return r;
}
Expand Down Expand Up @@ -401,15 +402,23 @@ aes128_encrypt_cmac_ft(struct sc_card *card, const unsigned char *key, int keysi
for (int i=0;i<16;i++){
data2[i]=data2[i]^k2Bin[offset + i];
}
}else{
}else if(length ==16){
memcpy(&data2[0],input,length);
haijie-ftsafe marked this conversation as resolved.
Show resolved Hide resolved
//k1 xor padded data
for (int i=0;i<16;i++){
data2[i]=data2[i]^k1Bin[offset + i];
}
}else{
memcpy(&data2[0],input,16);
//k1 xor padded data
for (int i=0;i<16;i++){
data2[i]=data2[i]^k1Bin[offset + i];
}
alg = sc_evp_cipher(card->ctx, "AES-128-CBC");
r = openssl_enc(alg, key, iv, data2, 16, output);
if( r!=SC_SUCCESS){
sc_log_openssl(card->ctx);
}
sc_evp_cipher_free(alg);
return r;
}
Expand Down Expand Up @@ -3425,8 +3434,7 @@ epass2003_pin_cmd(struct sc_card *card, struct sc_pin_cmd_data *data, int *tries
else if (data->cmd == SC_PIN_CMD_CHANGE || data->cmd == SC_PIN_CMD_UNBLOCK) { /* change */
r = external_key_auth(card, kid, (unsigned char *)data->pin1.data,
data->pin1.len);
if(r == SC_SUCCESS)
{
if(r == SC_SUCCESS){
r = update_secret_key(card, 0x04, kid, data->pin2.data,
(unsigned long)data->pin2.len);

Expand All @@ -3444,17 +3452,15 @@ epass2003_pin_cmd(struct sc_card *card, struct sc_pin_cmd_data *data, int *tries
r = external_key_auth(card, kid, (unsigned char *)data->pin1.data,
data->pin1.len);

if (SC_SUCCESS == get_external_key_retries(card, 0x80 | kid, &retries))
{
if (SC_SUCCESS == get_external_key_retries(card, 0x80 | kid, &retries)){
data->pin1.tries_left = retries;
if (tries_left)
*tries_left = retries;
}
LOG_TEST_RET(card->ctx, r, "verify pin failed");
}

if (r == SC_SUCCESS)
{
if (r == SC_SUCCESS){
data->pin1.logged_in = SC_PIN_STATE_LOGGED_IN;
}
return r;
Expand Down