diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am index 2063de73..5a6255f4 100644 --- a/src/libopensc/Makefile.am +++ b/src/libopensc/Makefile.am @@ -41,7 +41,7 @@ include_HEADERS = \ cardctl.h asn1.h log.h ui.h \ errors.h types.h -noinst_HEADERS = ctbcs.h internal.h esteid.h card-oberthur.h pinpad-ccid.h +noinst_HEADERS = ctbcs.h internal.h esteid.h pinpad-ccid.h pkgconfigdir = @libdir@/pkgconfig pkgconfig_DATA = libopensc.pc libpkcs15init.pc \ diff --git a/src/libopensc/card-oberthur.h b/src/libopensc/card-oberthur.h deleted file mode 100644 index d9ba2b0b..00000000 --- a/src/libopensc/card-oberthur.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef _OPENSC_CARD_OBERTHUR_H -#define _OPENSC_CARD_OBERTHUR_H - -#include - -#define AID_OBERTHUR_V2 0x201 -#define AID_OBERTHUR_V4 0x401 -#define AID_OBERTHUR_V5 0x501 - -#define ATR_OBERTHUR 0x0100 -#define ATR_OBERTHUR_32K 0x0110 -#define ATR_OBERTHUR_32K_BIO 0x0112 -#define ATR_OBERTHUR_64K 0x0120 - -#define AUTH_PIN 1 -#define AUTH_PUK 2 - -#define PUBKEY_512_ASN1_SIZE 0x4A -#define PUBKEY_1024_ASN1_SIZE 0x8C -#define PUBKEY_2048_ASN1_SIZE 0x10E - -#define SC_OBERTHUR_MAX_ATTR_SIZE 8 - -struct NTLV { - const char *name; - unsigned int tag; - size_t len; - const unsigned char *value; -}; -typedef struct NTLV NTLV_t; - -struct auth_application_id { - unsigned int tag; - u8 value[SC_MAX_AID_SIZE]; - int len; -}; -typedef struct auth_application_id auth_application_id_t; - -struct auth_senv { - unsigned int algorithm; - int key_file_id; - size_t key_size; -}; -typedef struct auth_senv auth_senv_t; - -struct auth_private_data { - struct sc_pin_cmd_pin pin_info; - long int sn; - auth_application_id_t aid; - auth_senv_t senv; -}; -typedef struct auth_private_data auth_private_data_t; - -#endif /* _OPENSC_CARD_OBERTHUR_H */ diff --git a/src/pkcs15init/pkcs15-oberthur.c b/src/pkcs15init/pkcs15-oberthur.c index 86263b78..54888a57 100644 --- a/src/pkcs15init/pkcs15-oberthur.c +++ b/src/pkcs15init/pkcs15-oberthur.c @@ -39,8 +39,6 @@ #include #include -#include "../libopensc/card-oberthur.h" - #define COSM_TITLE "OberthurAWP" #define COSM_TLV_TAG 0x00