giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

card-piv.c error in using sc_asn1-put-tag 

In piv_general_mutual_authenticate sc_asn1_put_tag is not used correctly.

 On branch piv-sc_asn1_put_tag-error
 Changes to be committed:
	modified:   card-piv.c
This commit is contained in:
Doug Engert 2020-05-12 16:20:39 -05:00 committed by Frank Morgner
parent 4e9cec1a64
commit 4ebb29ce4d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libopensc/card-piv.c
View File

@ -1670,28 +1670,30 @@ static int piv_general_mutual_authenticate(sc_card_t *card,
}
/* nonce for challenge */
tmplen = sc_asn1_put_tag(0x81, NULL, witness_len, NULL, 0, NULL);
if (tmplen <= 0) {
r = sc_asn1_put_tag(0x81, NULL, witness_len, NULL, 0, NULL);
if (r <= 0) {
r = SC_ERROR_INTERNAL;
goto err;
}
tmplen = r;
/* plain text witness keep a length separate for the 0x7C tag */
tmplen2 = sc_asn1_put_tag(0x80, NULL, witness_len, NULL, 0, NULL);
if (tmplen2 <= 0) {
r = sc_asn1_put_tag(0x80, NULL, witness_len, NULL, 0, NULL);
if (r <= 0) {
r = SC_ERROR_INTERNAL;
goto err;
}
tmplen2 += tmplen;
tmplen += r;
tmplen2 = tmplen;
/* outside 7C tag with 81:80 as innards */
tmplen = sc_asn1_put_tag(0x7C, NULL, tmplen, NULL, 0, NULL);
if (tmplen <= 0) {
r = sc_asn1_put_tag(0x7C, NULL, tmplen, NULL, 0, NULL);
if (r <= 0) {
r = SC_ERROR_INTERNAL;
goto err;
}
built_len = tmplen;
built_len = r;
/* Build the response buffer */
p = built = malloc(built_len);