security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-16 00:29:50 +02:00
Code Activity

* Always use 'dynload.h' instead of 'dlfcn.h'.

Browse Source
This commit is contained in:
Timo Schulz 2003-08-14 12:20:08 +00:00
parent f099ed75b8
commit abbb66e037
5 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scd/ChangeLog
View File

@ -1,3 +1,9 @@
2003-08-14 Timo Schulz <twoaday@freakmail.de>
* apdu.c (ct_activate_card): Change the code a little to avoid
problems with other readers.
* Always use 'dynload.h' instead of 'dlfcn.h'.
2003-08-05 Werner Koch <wk@gnupg.org> 2003-08-05 Werner Koch <wk@gnupg.org>
* app-openpgp.c (dump_all_do): Don't analyze constructed DOs after * app-openpgp.c (dump_all_do): Don't analyze constructed DOs after

7
scd/apdu.c
View File

@ -23,11 +23,11 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <dlfcn.h>
#include <assert.h> #include <assert.h>
#include "scdaemon.h" #include "scdaemon.h"
#include "apdu.h" #include "apdu.h"
#include "dynload.h"
#define MAX_READER 4 /* Number of readers we support concurrently. */ #define MAX_READER 4 /* Number of readers we support concurrently. */
#define CARD_CONNECT_TIMEOUT 1 /* Number of seconds to wait for #define CARD_CONNECT_TIMEOUT 1 /* Number of seconds to wait for
@ -232,8 +232,7 @@ ct_activate_card (int reader)
return -1; return -1;
} }
if (buf[0] == 0x05) /* Connected, now activate the card. */
{ /* Connected, now activate the card. */
dad[0] = 1; /* Destination address: CT. */ dad[0] = 1; /* Destination address: CT. */
sad[0] = 2; /* Source address: Host. */ sad[0] = 2; /* Source address: Host. */
@ -266,8 +265,6 @@ ct_activate_card (int reader)
return 0; return 0;
} }
}
log_info ("ct_activate_card(%d): timeout waiting for card\n", reader); log_info ("ct_activate_card(%d): timeout waiting for card\n", reader);
return -1; return -1;
} }

3
scd/app.c
View File

@ -23,12 +23,13 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <dlfcn.h>
#include "scdaemon.h" #include "scdaemon.h"
#include "app-common.h" #include "app-common.h"
#include "apdu.h" #include "apdu.h"
#include "iso7816.h" #include "iso7816.h"
#include "dynload.h"
static char *default_reader_port; static char *default_reader_port;

2
scd/atr.c
View File

@ -23,12 +23,12 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <dlfcn.h>
#include <assert.h> #include <assert.h>
#include "scdaemon.h" #include "scdaemon.h"
#include "apdu.h" #include "apdu.h"
#include "atr.h" #include "atr.h"
#include "dynload.h"
static int const fi_table[16] = { 0, 372, 558, 744, 1116,1488, 1860, -1, static int const fi_table[16] = { 0, 372, 558, 744, 1116,1488, 1860, -1,
-1, 512, 768, 1024, 1536, 2048, -1, -1 }; -1, 512, 768, 1024, 1536, 2048, -1, -1 };

2
scd/iso7816.c
View File

@ -23,11 +23,11 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <dlfcn.h>
#include "scdaemon.h" #include "scdaemon.h"
#include "iso7816.h" #include "iso7816.h"
#include "apdu.h" #include "apdu.h"
#include "dynload.h"
#define CMD_SELECT_FILE 0xA4 #define CMD_SELECT_FILE 0xA4
#define CMD_VERIFY 0x20 #define CMD_VERIFY 0x20