From 363e3746646994ae18fa8d32fb4773687e366ea3 Mon Sep 17 00:00:00 2001
From: Viktor Tarasov <viktor.tarasov@gmail.com>
Date: Sat, 26 May 2012 09:21:35 +0200
Subject: [PATCH] pkcs15init: syntax changed for the ias(ecc) profiles

---
 src/pkcs15init/ias_adele_common.profile   |  8 ++++----
 src/pkcs15init/iasecc_admin_eid.profile   | 18 ++++++++++--------
 src/pkcs15init/iasecc_generic_pki.profile |  4 +++-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/pkcs15init/ias_adele_common.profile b/src/pkcs15init/ias_adele_common.profile
index 2b70daa7..9c5b81fe 100644
--- a/src/pkcs15init/ias_adele_common.profile
+++ b/src/pkcs15init/ias_adele_common.profile
@@ -139,10 +139,10 @@ filesystem {
 
                 # Private data
                 EF  private-data {
-                    file-id = F000;
+                    file-id = B200;
                     size    = 36;
                     ACL     = *=NONE;
-                    ACL     = WRITE=SCBx17, UPDATE=SCBx17, READ=SCBx17;
+                    ACL     =  WRITE=SCBx17, UPDATE=SCBx17, READ=SCBx17, DELETE=SCBx17;
                 }
 
                 # Certificate
@@ -168,9 +168,9 @@ filesystem {
 
                 # Public data
                 EF  public-data {
-                    file-id = D000;
+                    file-id = B100;
                     ACL     = *=NONE;
-                    ACL     = WRITE=SCBx17, UPDATE=SCBx17, DELETE=NONE;
+                    ACL     = WRITE=SCBx17, UPDATE=SCBx17, DELETE=SCBx17;
                 }
             }
         }
diff --git a/src/pkcs15init/iasecc_admin_eid.profile b/src/pkcs15init/iasecc_admin_eid.profile
index 3eadaf21..395720bc 100644
--- a/src/pkcs15init/iasecc_admin_eid.profile
+++ b/src/pkcs15init/iasecc_admin_eid.profile
@@ -13,11 +13,13 @@ cardinfo {
 
 pkcs15 {
     # Put certificates into the CDF itself?
-    direct-certificates    = no;
+    direct-certificates = no;
     # Put the DF length into the ODF file?
     encode-df-length    = no;
     # Have a lastUpdate field in the EF(TokenInfo)?
-    do-last-update        = yes;
+    do-last-update      = yes;
+    # Style of pkcs#15-init support of minidriver: 'none', 'gemalto';
+    minidriver-support-style	= none;
 }
 
 option ecc {
@@ -76,7 +78,7 @@ filesystem {
 
         DF PKCS15-AppDF  {
             type    = DF;
-            aid     = E8:28:BD:08:0F:D2:50:45:43:43:2D:65:49:44;
+            exclusive-aid = E8:28:BD:08:0F:D2:50:45:43:43:2D:65:49:44;
             acl     = *=NONE;
             size    = 5000;
 
@@ -133,7 +135,7 @@ filesystem {
                 # Private RSA keys
                 BSO private-key {
                     ACL     = *=NEVER;
-                    ACL     = SIGN=SCBx13, AUTHENTICATE=SCBx13, DECIPHER=SCBx13, GENERATE=SCBx44, UPDATE=SCBx44, READ=NONE;
+                    ACL     = PSO-COMPUTE-SIGNATURE=SCBx13, INTERNAL-AUTHENTICATE=SCBx13, PSO-DECRYPT=SCBx13, GENERATE=SCBx44, UPDATE=SCBx44, READ=NONE;
                 }
 
                 # Private DES keys
@@ -147,7 +149,7 @@ filesystem {
                     file-id = E000;
                     size    = 36;
                     ACL     = *=NONE;
-                    ACL     = WRITE=SCBx13, UPDATE=SCBx13, READ=SCBx13;
+                    ACL     = WRITE=SCBx44, UPDATE=SCBx44, READ=SCBx13;
                 }
 
                 # Certificate
@@ -160,7 +162,7 @@ filesystem {
                 #Public Key
                 BSO public-key {
                     ACL     = *=NEVER;
-                    ACL     = AUTHENTICATE=SCBx13, GENERATE=SCBx44, UPDATE=SCBx44, READ=NONE;
+                    ACL     = INTERNAL-AUTHENTICATE=SCBx13, GENERATE=SCBx44, UPDATE=SCBx44, READ=NONE;
                 }
 
                 # Public DES keys
@@ -171,9 +173,9 @@ filesystem {
 
                 # Public data
                 EF  public-data {
-                    file-id = D000;
+                    file-id = B104;
                     ACL     = *=NONE;
-                    ACL     = WRITE=IDAxC1, UPDATE=IDAxC1, DELETE=NONE;
+                    ACL     = WRITE=SCBx44, UPDATE=SCBx44;
                 }
             }
         }
diff --git a/src/pkcs15init/iasecc_generic_pki.profile b/src/pkcs15init/iasecc_generic_pki.profile
index d4a7d4ca..da5b0dec 100644
--- a/src/pkcs15init/iasecc_generic_pki.profile
+++ b/src/pkcs15init/iasecc_generic_pki.profile
@@ -18,6 +18,8 @@ pkcs15 {
     encode-df-length    = no;
     # Have a lastUpdate field in the EF(TokenInfo)?
     do-last-update      = yes;
+    # Style of pkcs#15-init support of minidriver: 'none', 'gemalto';
+    minidriver-support-style    = gemalto;
 }
 
 option ecc {
@@ -168,7 +170,7 @@ filesystem {
 
                 # Public data
                 EF  public-data {
-                    file-id = F000;
+                    file-id = B101;
                     ACL     = *=NONE;
                     ACL     = WRITE=SCBx13, UPDATE=SCBx13, DELETE=NONE;
                 }