Solve handling of wrong length status codes with SM card bug and Add ECC support in Feitian ePass2003 #1127
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Check the communication #1110 The issue is related SM card, when got response 6CXX, case sc_set_le_and_transmit API retries the command and only changing apdu->resplen and apdu->le, then call sc_single_transmit, at this time, the SM authenticated message won't work, because it still contains the orginal LE. modify sm.c file solve the issue.
Add ePass2003 ECC support, the related feedback check #1073
frankmorgner
requested changes
Aug 8, 2017
majkrzak
suggested changes
Aug 10, 2017
There was a problem hiding this comment.
I've marked and fixed compilation errors reported by Travis. I hope it will help you to submit good code.
diff --git a/src/libopensc/card-epass2003.c b/src/libopensc/card-epass2003.c
index 33b77601..8f582b13 100644
--- a/src/libopensc/card-epass2003.c
+++ b/src/libopensc/card-epass2003.c
@@ -172,7 +172,7 @@ static const struct sc_card_error epass2003_errors[] = {
static int epass2003_transmit_apdu(struct sc_card *card, struct sc_apdu *apdu);
static int epass2003_select_file(struct sc_card *card, const sc_path_t * in_path, sc_file_t ** file_out);
int epass2003_refresh(struct sc_card *card);
-static int hash_data(unsigned char *data, size_t datalen, unsigned char *hash, unsigned int mechanismType);
+static int hash_data(const unsigned char *data, size_t datalen, unsigned char *hash, unsigned int mechanismType);
static int
epass2003_check_sw(struct sc_card *card, unsigned int sw1, unsigned int sw2)
@@ -1204,7 +1204,7 @@ epass2003_init(struct sc_card *card)
//set EC Alg Flags
flags = SC_ALGORITHM_ONBOARD_KEY_GEN|SC_ALGORITHM_ECDSA_HASH_SHA1|SC_ALGORITHM_ECDSA_HASH_SHA256|SC_ALGORITHM_ECDSA_HASH_NONE|SC_ALGORITHM_ECDSA_RAW;
- //ext_flags = SC_ALGORITHM_EXT_EC_NAMEDCURVE | SC_ALGORITHM_EXT_EC_UNCOMPRESES;
+ ext_flags = 0;//ext_flags = SC_ALGORITHM_EXT_EC_NAMEDCURVE | SC_ALGORITHM_EXT_EC_UNCOMPRESES;
_sc_card_add_ec_alg(card, 256, flags, ext_flags, NULL);
card->caps = SC_CARD_CAP_RNG | SC_CARD_CAP_APDU_EXT;
@@ -2235,7 +2235,7 @@ internal_write_rsa_key(struct sc_card *card, unsigned short fid, struct sc_pkcs1
static int
-hash_data(unsigned char *data, size_t datalen, unsigned char *hash, unsigned int mechanismType)
+hash_data(const unsigned char *data, size_t datalen, unsigned char *hash, unsigned int mechanismType)
{
if ((NULL == data) || (NULL == hash))
@@ -2483,7 +2483,7 @@ epass2003_card_ctl(struct sc_card *card, unsigned long cmd, void *ptr)
{
LOG_FUNC_CALLED(card->ctx);
- sc_log(card->ctx, "cmd is %0x", cmd);
+ sc_log(card->ctx, "cmd is %0lx", cmd);
switch (cmd) {
case SC_CARDCTL_ENTERSAFE_WRITE_KEY:
return epass2003_write_key(card, (sc_epass2003_wkey_data *) ptr);
src/libopensc/card-epass2003.c
Outdated
| @@ -1192,6 +1202,11 @@ epass2003_init(struct sc_card *card) | |||
| _sc_card_add_rsa_alg(card, 1024, flags, 0); | |||
| _sc_card_add_rsa_alg(card, 2048, flags, 0); | |||
|
|
|||
| //set EC Alg Flags | |||
| flags = SC_ALGORITHM_ONBOARD_KEY_GEN|SC_ALGORITHM_ECDSA_HASH_SHA1|SC_ALGORITHM_ECDSA_HASH_SHA256|SC_ALGORITHM_ECDSA_HASH_NONE|SC_ALGORITHM_ECDSA_RAW; | |||
| //ext_flags = SC_ALGORITHM_EXT_EC_NAMEDCURVE | SC_ALGORITHM_EXT_EC_UNCOMPRESES; | |||
There was a problem hiding this comment.
Initialize ext_flags to zero or to this commented flags.
src/libopensc/card-epass2003.c
Outdated
| @@ -170,6 +172,7 @@ static const struct sc_card_error epass2003_errors[] = { | |||
| static int epass2003_transmit_apdu(struct sc_card *card, struct sc_apdu *apdu); | |||
| static int epass2003_select_file(struct sc_card *card, const sc_path_t * in_path, sc_file_t ** file_out); | |||
| int epass2003_refresh(struct sc_card *card); | |||
| static int hash_data(unsigned char *data, size_t datalen, unsigned char *hash, unsigned int mechanismType); | |||
There was a problem hiding this comment.
Add a const specifier to data param.
src/libopensc/card-epass2003.c
Outdated
| @@ -2349,6 +2483,7 @@ epass2003_card_ctl(struct sc_card *card, unsigned long cmd, void *ptr) | |||
| { | |||
| LOG_FUNC_CALLED(card->ctx); | |||
|
|
|||
| sc_log(card->ctx, "cmd is %0x", cmd); | |||
There was a problem hiding this comment.
Replace format specifier with %0lx.
|
To make it clearly, close this PR, will open another PR, thanks |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1073
Fixes #1115
Checklist