From 190c138e53959be49dd27bc43bf6874123c2ff24 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Tue, 3 Jul 2007 14:20:04 +0000 Subject: [PATCH] Respect mask used when searching for cards. git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1415 423420c4-83ab-492f-b58f-81f9feb106b5 --- scard.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scard.c b/scard.c index aba4086..357615d 100644 --- a/scard.c +++ b/scard.c @@ -1286,10 +1286,8 @@ TS_SCardLocateCardsByATR(STREAM in, STREAM out, RD_BOOL wide) RD_BOOL equal = 1; for (k = 0; k < cur->cbAtr; k++) { - /* This line check if them equal */ - if (cur->rgbAtr[k] != rsCur->rgbAtr[k]) - /* Next Line was make to search with mask (some strange behavours with applications which use eToken SmartCards) */ - /* if((cur->rgbAtr[k]&cur->rgbMask[k])!=(rsCur->rgbAtr[k]&cur->rgbMask[k])){ */ + if ((cur->rgbAtr[k] & cur->rgbMask[k]) != + (rsCur->rgbAtr[k] & cur->rgbMask[k])) { equal = 0; break;