From 68a49360d20746a90c3dc5cdcb8f0b52135357d5 Mon Sep 17 00:00:00 2001
From: nils <nils@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Fri, 9 Sep 2005 19:51:38 +0000
Subject: [PATCH] pkcs15-netkey.c -> pkcs15-tcos.c

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2566 c6295689-39f2-0310-b995-f0e70906c6a9
---
 src/libopensc/Makefile.am                        | 2 +-
 src/libopensc/Makefile.mak                       | 2 +-
 src/libopensc/pkcs15-syn.c                       | 4 ++--
 src/libopensc/{pkcs15-netkey.c => pkcs15-tcos.c} | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename src/libopensc/{pkcs15-netkey.c => pkcs15-tcos.c} (99%)

diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am
index 34055cea..1310281e 100644
--- a/src/libopensc/Makefile.am
+++ b/src/libopensc/Makefile.am
@@ -30,7 +30,7 @@ libopensc_la_SOURCES = \
 	card-oberthur.c card-belpic.c card-atrust-acos.c \
 	\
 	pkcs15-openpgp.c pkcs15-infocamere.c pkcs15-starcert.c \
-	pkcs15-netkey.c pkcs15-esteid.c pkcs15-postecert.c pkcs15-gemsafe.c \
+	pkcs15-tcos.c pkcs15-esteid.c pkcs15-postecert.c pkcs15-gemsafe.c \
 	pkcs15-actalis.c pkcs15-atrust-acos.c
 libopensc_la_LDFLAGS = -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@
 libopensc_la_LIBADD = @LIBSCCONF@ $(OPENSSL_LIBS) $(OPENCT_LIBS) $(PCSC_LIBS) $(LTLIBLTDL)
diff --git a/src/libopensc/Makefile.mak b/src/libopensc/Makefile.mak
index a8b9daa0..18b72481 100644
--- a/src/libopensc/Makefile.mak
+++ b/src/libopensc/Makefile.mak
@@ -28,7 +28,7 @@ OBJECTS			= \
 	card-oberthur.obj card-belpic.obj card-atrust-acos.obj \
 	\
 	pkcs15-openpgp.obj pkcs15-infocamere.obj pkcs15-starcert.obj \
-	pkcs15-netkey.obj pkcs15-esteid.obj pkcs15-postecert.obj \
+	pkcs15-tcos.obj pkcs15-esteid.obj pkcs15-postecert.obj \
 	pkcs15-gemsafe.obj pkcs15-actalis.obj pkcs15-atrust-acos.obj \
 	\
 	$(TOPDIR)\win32\version.res
diff --git a/src/libopensc/pkcs15-syn.c b/src/libopensc/pkcs15-syn.c
index 09b74311..d91c9d1a 100644
--- a/src/libopensc/pkcs15-syn.c
+++ b/src/libopensc/pkcs15-syn.c
@@ -34,7 +34,7 @@ extern int sc_pkcs15emu_infocamere_init_ex(sc_pkcs15_card_t *,
 					sc_pkcs15emu_opt_t *);
 extern int sc_pkcs15emu_starcert_init_ex(sc_pkcs15_card_t *,
 					sc_pkcs15emu_opt_t *);
-extern int sc_pkcs15emu_netkey_init_ex(sc_pkcs15_card_t *,
+extern int sc_pkcs15emu_tcos_init_ex(sc_pkcs15_card_t *,
 					sc_pkcs15emu_opt_t *);
 extern int sc_pkcs15emu_esteid_init_ex(sc_pkcs15_card_t *,
 					sc_pkcs15emu_opt_t *);
@@ -54,7 +54,7 @@ static struct {
 	{ "openpgp",	sc_pkcs15emu_openpgp_init_ex	},
 	{ "infocamere",	sc_pkcs15emu_infocamere_init_ex	},
 	{ "starcert",	sc_pkcs15emu_starcert_init_ex	},
-	{ "netkey",	sc_pkcs15emu_netkey_init_ex	},
+	{ "tcos",	sc_pkcs15emu_tcos_init_ex	},
 	{ "esteid",	sc_pkcs15emu_esteid_init_ex	},
 	{ "postecert",	sc_pkcs15emu_postecert_init_ex  },
 	{ "gemsafe",	sc_pkcs15emu_gemsafe_init_ex	},
diff --git a/src/libopensc/pkcs15-netkey.c b/src/libopensc/pkcs15-tcos.c
similarity index 99%
rename from src/libopensc/pkcs15-netkey.c
rename to src/libopensc/pkcs15-tcos.c
index 3e1c75c7..f4fc147f 100644
--- a/src/libopensc/pkcs15-netkey.c
+++ b/src/libopensc/pkcs15-tcos.c
@@ -187,7 +187,7 @@ int sc_pkcs15emu_tcos_init_ex(sc_pkcs15_card_t *p15card, sc_pkcs15emu_opt_t *opt
 		}
 	}
 	if (ctx->debug >= 1) sc_debug(ctx, "Detected TCOS-Card Type-%d\n", cardtype);
-	if(cardtype<1 || cardtype>sizeof(cardlist)/sizeof(cardlist[0])){
+	if(cardtype<1 || cardtype>(int)(sizeof(cardlist)/sizeof(cardlist[0]))){
 		r = SC_ERROR_WRONG_CARD;
 		goto failed;
 	}