Changeset 4251a23 in OpenSC

Timestamp:

12/21/11 09:25:06 (5 months ago)

Author:

Xiaoshuo

Children:

aae5b93

Parents:

d505a55

git-author:

Xiaoshuo <xiaoshuo@…> (12/21/11 09:25:06)

git-committer:

Xiaoshuo <xiaoshuo@…> (12/21/11 09:25:06)

Message:

Add ePass2003(3rd edition).

Files:

• src/libopensc/Makefile.am (modified) (1 diff)
• src/libopensc/Makefile.mak (modified) (1 diff)
• src/libopensc/card-epass2003.c (added)
• src/libopensc/cardctl.h (modified) (1 diff)
• src/libopensc/cards.h (modified) (2 diffs)
• src/libopensc/ctx.c (modified) (1 diff)
• src/pkcs15init/Makefile.am (modified) (2 diffs)
• src/pkcs15init/Makefile.mak (modified) (1 diff)
• src/pkcs15init/epass2003.profile (added)
• src/pkcs15init/pkcs15-epass2003.c (added)
• src/pkcs15init/pkcs15-init.h (modified) (1 diff)
• src/pkcs15init/pkcs15-lib.c (modified) (1 diff)
• win32/OpenSC.wxs.in (modified) (2 diffs)

src/libopensc/Makefile.am

@@ -35 +35 @@
         card-mcrd.c card-starcos.c card-openpgp.c card-jcop.c \
         card-oberthur.c card-belpic.c card-atrust-acos.c card-entersafe.c \
+        card-epass2003.c \
         card-incrypto34.c card-piv.c card-muscle.c card-acos5.c \
         card-asepcos.c card-akis.c card-gemsafeV1.c card-rutoken.c \

src/libopensc/Makefile.mak

@@ -18 +18 @@
         card-mcrd.obj card-starcos.obj card-openpgp.obj card-jcop.obj \
         card-oberthur.obj card-belpic.obj card-atrust-acos.obj card-entersafe.obj \
+        card-epass2003.obj \
         card-incrypto34.obj card-piv.obj card-muscle.obj card-acos5.obj \
         card-asepcos.obj card-akis.obj card-gemsafeV1.obj card-rutoken.obj \

src/libopensc/cardctl.h

@@ -710 +710 @@
 } sc_entersafe_gen_key_data;
 
+#define SC_EPASS2003_KEY        0x00000010
+#define SC_EPASS2003_KEY_RSA    0x00000011
+#define SC_EPASS2003_SECRET     0x00000020
+#define SC_EPASS2003_SECRET_PRE 0x00000021
+#define SC_EPASS2003_SECRET_PIN 0x00000022
+
+#define EPASS2003_AC_EVERYONE 0x00
+#define EPASS2003_AC_USER 0x06
+#define EPASS2003_AC_SO 0x08
+#define EPASS2003_AC_NOONE 0x0F
+#define EPASS2003_AC_MAC_UNEQUAL 0x80
+#define EPASS2003_AC_MAC_NOLESS 0x90
+#define EPASS2003_AC_MAC_LESS 0xA0
+#define EPASS2003_AC_MAC_EQUAL 0xB0
+
+#define FID_STEP 0x20
+
+typedef struct sc_epass2003_wkey_data_st {
+         u8 type;
+         union {
+                  struct {
+                          unsigned short fid;
+                          struct sc_pkcs15_prkey_rsa* rsa;
+                  } es_key;
+                  struct {
+                          u8 kid;
+                          u8 EC;
+                          u8 ac[2];
+                          u8 key_val[256];
+                          size_t key_len;
+                  } es_secret;
+         } key_data;
+} sc_epass2003_wkey_data;
+
+typedef struct sc_epass2003_gen_key_data_st {
+         int prkey_id;
+         int pukey_id;
+         size_t key_length;
+         u8 *modulus;
+} sc_epass2003_gen_key_data;
+
 #if defined(__APPLE__) || defined(sun)
 #pragma pack()

src/libopensc/cards.h

@@ -157 +157 @@
         SC_CARD_TYPE_ENTERSAFE_3K,
         SC_CARD_TYPE_ENTERSAFE_FTCOS_PK_01C,
+        SC_CARD_TYPE_ENTERSAFE_FTCOS_EPASS2003,
 
         /* MyEID cards */
@@ -212 +213 @@
 extern sc_card_driver_t *sc_get_akis_driver(void);
 extern sc_card_driver_t *sc_get_entersafe_driver(void);
+extern sc_card_driver_t *sc_get_epass2003_driver(void);
 extern sc_card_driver_t *sc_get_rutoken_driver(void);
 extern sc_card_driver_t *sc_get_rtecp_driver(void);

src/libopensc/ctx.c

@@ -92 +92 @@
 #ifdef ENABLE_OPENSSL
         { "entersafe",(void *(*)(void)) sc_get_entersafe_driver },
+        { "epass2003",(void *(*)(void)) sc_get_epass2003_driver },
 #endif
         { "rutoken",    (void *(*)(void)) sc_get_rutoken_driver },

src/pkcs15init/Makefile.am

@@ -22 +22 @@
         asepcos.profile \
         entersafe.profile \
+        epass2003.profile \
         rutoken_ecp.profile \
         westcos.profile \
@@ -41 +42 @@
         pkcs15-setcos.c pkcs15-incrypto34.c pkcs15-muscle.c \
         pkcs15-asepcos.c pkcs15-rutoken.c pkcs15-entersafe.c \
-        pkcs15-rtecp.c pkcs15-myeid.c \
+        pkcs15-rtecp.c pkcs15-myeid.c pkcs15-epass2003.c \
         pkcs15-oberthur.c pkcs15-oberthur-awp.c \
         pkcs15-authentic.c pkcs15-iasecc.c 

src/pkcs15init/Makefile.mak

@@ -9 +9 @@
           pkcs15-muscle.obj pkcs15-asepcos.obj pkcs15-rutoken.obj \
           pkcs15-entersafe.obj pkcs15-rtecp.obj pkcs15-westcos.obj \
-          pkcs15-myeid.obj pkcs15-authentic.obj pkcs15-iasecc.obj 
+                  pkcs15-myeid.obj pkcs15-authentic.obj pkcs15-iasecc.obj \
+                  pkcs15-epass2003.obj
 
 all: $(TARGET) 

src/pkcs15init/pkcs15-init.h

@@ -392 +392 @@
 extern struct sc_pkcs15init_operations *sc_pkcs15init_get_rutoken_ops(void);
 extern struct sc_pkcs15init_operations *sc_pkcs15init_get_entersafe_ops(void);
+extern struct sc_pkcs15init_operations *sc_pkcs15init_get_epass2003_ops(void);
 extern struct sc_pkcs15init_operations *sc_pkcs15init_get_rtecp_ops(void);
 extern struct sc_pkcs15init_operations *sc_pkcs15init_get_westcos_ops(void);

src/pkcs15init/pkcs15-lib.c

@@ -148 +148 @@
         { "asepcos", (void*) sc_pkcs15init_get_asepcos_ops },
         { "entersafe",(void*) sc_pkcs15init_get_entersafe_ops },
+        { "epass2003",(void*) sc_pkcs15init_get_epass2003_ops },
         { "rutoken_ecp", (void *) sc_pkcs15init_get_rtecp_ops },
         { "westcos", (void *) sc_pkcs15init_get_westcos_ops },

win32/OpenSC.wxs.in

@@ -108 +108 @@
                 <File Source="$(var.SOURCE_DIR)\src\pkcs15init\entersafe.profile"/>
               </Component>
+              <Component Id="epass2003.profile" Guid="*" Win64="$(var.Win64YesNo)">
+                <File Source="$(var.SOURCE_DIR)\src\pkcs15init\epass2003.profile"/>
+              </Component>
               <Component Id="myeid.profile" Guid="*" Win64="$(var.Win64YesNo)">
                 <File Source="$(var.SOURCE_DIR)\src\pkcs15init\myeid.profile"/>
@@ -174 +177 @@
         <ComponentRef Id="cardos.profile"/>
         <ComponentRef Id="entersafe.profile"/>
+        <ComponentRef Id="epass2003.profile"/>
         <ComponentRef Id="myeid.profile"/>
         <ComponentRef Id="setcos.profile"/>