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

let ykpiv_connect() call ykpiv_list_readers()

Browse Source
This commit is contained in:
Klas Lindfors
2015-09-08 12:29:07 +02:00
parent 8eb7595d42
commit 4bbd888f97
1 changed files with 5 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ykpiv.c
+5 -33
View File
@@ -128,43 +128,15 @@ ykpiv_rc ykpiv_disconnect(ykpiv_state *state) {
} }
ykpiv_rc ykpiv_connect(ykpiv_state *state, const char *wanted) { ykpiv_rc ykpiv_connect(ykpiv_state *state, const char *wanted) {
unsigned long num_readers = 0;
unsigned long active_protocol; unsigned long active_protocol;
char reader_buf[1024]; char reader_buf[2048];
size_t num_readers = sizeof(reader_buf);
long rc; long rc;
char *reader_ptr; char *reader_ptr;
if(SCardIsValidContext(state->context) != SCARD_S_SUCCESS) { ykpiv_rc ret = ykpiv_list_readers(state, reader_buf, &num_readers);
rc = SCardEstablishContext(SCARD_SCOPE_SYSTEM, NULL, NULL, &state->context); if(ret != YKPIV_OK) {
if (rc != SCARD_S_SUCCESS) { return ret;
if(state->verbose) {
fprintf (stderr, "error: SCardEstablishContext failed, rc=%08lx\n", rc);
}
return YKPIV_PCSC_ERROR;
}
}
rc = SCardListReaders(state->context, NULL, NULL, &num_readers);
if (rc != SCARD_S_SUCCESS) {
if(state->verbose) {
fprintf (stderr, "error: SCardListReaders failed, rc=%08lx\n", rc);
}
SCardReleaseContext(state->context);
return YKPIV_PCSC_ERROR;
}
if (num_readers > sizeof(reader_buf)) {
num_readers = sizeof(reader_buf);
}
rc = SCardListReaders(state->context, NULL, reader_buf, &num_readers);
if (rc != SCARD_S_SUCCESS)
{
if(state->verbose) {
fprintf (stderr, "error: SCardListReaders failed, rc=%08lx\n", rc);
}
SCardReleaseContext(state->context);
return YKPIV_PCSC_ERROR;
} }
for(reader_ptr = reader_buf; *reader_ptr != '\0'; reader_ptr += strlen(reader_ptr) + 1) { for(reader_ptr = reader_buf; *reader_ptr != '\0'; reader_ptr += strlen(reader_ptr) + 1) {