Ticket #2569: Token memory not wiped after key deletion

This is the dogtag upstream side of the TPS portion of this ticket.
This fix also involves an applet fix, handled in another bug.

3 files changed, 20 insertions, 20 deletions

diff --git a/base/tps/shared/applets/1.4.58768072.ijc b/base/tps/shared/applets/1.4.58768072.ijc
new file mode 100644
index 000000000..0bfd59af9
--- /dev/null
+++ b/base/tps/shared/applets/1.4.58768072.ijc
diff --git a/base/tps/shared/applets/readme.txt b/base/tps/shared/applets/readme.txt
index 8e837cd2e..91da25393 100644
--- a/base/tps/shared/applets/readme.txt
+++ b/base/tps/shared/applets/readme.txt
@@ -34,5 +34,5 @@ Additional applets:
 
 330J/RSA / Key Recovery, GP201, also works with SCP02:
 
-1.4.54de790f.ijc
+1.4.58768072.ijc
 
diff --git a/base/tps/shared/conf/CS.cfg b/base/tps/shared/conf/CS.cfg
index a585e5db7..dcc81cfd0 100644
--- a/base/tps/shared/conf/CS.cfg
+++ b/base/tps/shared/conf/CS.cfg
@@ -9,7 +9,7 @@ applet._000=#########################################
 applet._001=# applet information
 applet._002=# SAF Key:
 applet._003=# applet.aid.cardmgr_instance=A0000001510000
-applet._004=# Stock RSA,KeyRecover applet : 1.4.54de790f.ijc
+applet._004=# Stock RSA,KeyRecover applet : 1.4.58768072.ijc 
 applet._005=# Beta RSA/KeyRecovery/GP211/SCP02 applet : 1.5.558cdcff.ijc
 applet._006=# Use GP211 applet only with SCP02 card
 applet._007=#########################################
@@ -453,7 +453,7 @@ op.enroll.delegateIEtoken.update.applet.directory=/usr/share/pki/tps/applets
 op.enroll.delegateIEtoken.update.applet.emptyToken.enable=true
 op.enroll.delegateIEtoken.update.applet.enable=true
 op.enroll.delegateIEtoken.update.applet.encryption=true
-op.enroll.delegateIEtoken.update.applet.requiredVersion=1.4.54de790f
+op.enroll.delegateIEtoken.update.applet.requiredVersion=1.4.58768072
 op.enroll.delegateIEtoken.update.symmetricKeys.enable=false
 op.enroll.delegateIEtoken.update.symmetricKeys.requiredVersion=1
 op.format.delegateIEtoken.auth.enable=true
@@ -475,7 +475,7 @@ op.format.delegateIEtoken.tks.conn=tks1
 op.format.delegateIEtoken.update.applet.directory=/usr/share/pki/tps/applets
 op.format.delegateIEtoken.update.applet.emptyToken.enable=true
 op.format.delegateIEtoken.update.applet.encryption=true
-op.format.delegateIEtoken.update.applet.requiredVersion=1.4.54de790f
+op.format.delegateIEtoken.update.applet.requiredVersion=1.4.58768072
 op.format.delegateIEtoken.update.symmetricKeys.enable=false
 op.format.delegateIEtoken.update.symmetricKeys.requiredVersion=1
 op.enroll.delegateISEtoken._000=#########################################
@@ -751,7 +751,7 @@ op.enroll.delegateISEtoken.update.applet.directory=/usr/share/pki/tps/applets
 op.enroll.delegateISEtoken.update.applet.emptyToken.enable=true
 op.enroll.delegateISEtoken.update.applet.enable=true
 op.enroll.delegateISEtoken.update.applet.encryption=true
-op.enroll.delegateISEtoken.update.applet.requiredVersion=1.4.54de790f
+op.enroll.delegateISEtoken.update.applet.requiredVersion=1.4.58768072
 op.enroll.delegateISEtoken.update.symmetricKeys.enable=false
 op.enroll.delegateISEtoken.update.symmetricKeys.requiredVersion=1
 op.format.delegateISEtoken.auth.enable=true
@@ -773,7 +773,7 @@ op.format.delegateISEtoken.tks.conn=tks1
 op.format.delegateISEtoken.update.applet.directory=/usr/share/pki/tps/applets
 op.format.delegateISEtoken.update.applet.emptyToken.enable=true
 op.format.delegateISEtoken.update.applet.encryption=true
-op.format.delegateISEtoken.update.applet.requiredVersion=1.4.54de790f
+op.format.delegateISEtoken.update.applet.requiredVersion=1.4.58768072
 op.format.delegateISEtoken.update.symmetricKeys.enable=false
 op.format.delegateISEtoken.update.symmetricKeys.requiredVersion=1
 op.enroll.externalRegAddToToken._000=#########################################
@@ -847,7 +847,7 @@ op.enroll.externalRegAddToToken.update.applet.directory=/usr/share/pki/tps/apple
 op.enroll.externalRegAddToToken.update.applet.emptyToken.enable=true
 op.enroll.externalRegAddToToken.update.applet.enable=false
 op.enroll.externalRegAddToToken.update.applet.encryption=true
-op.enroll.externalRegAddToToken.update.applet.requiredVersion=1.4.54de790f
+op.enroll.externalRegAddToToken.update.applet.requiredVersion=1.4.58768072
 op.enroll.externalRegAddToToken.update.symmetricKeys.enable=false
 op.enroll.externalRegAddToToken.update.symmetricKeys.requiredVersion=1
 op.format.externalRegAddToToken.auth.enable=true
@@ -869,7 +869,7 @@ op.format.externalRegAddToToken.tks.conn=tks1
 op.format.externalRegAddToToken.update.applet.directory=/usr/share/pki/tps/applets
 op.format.externalRegAddToToken.update.applet.emptyToken.enable=true
 op.format.externalRegAddToToken.update.applet.encryption=true
-op.format.externalRegAddToToken.update.applet.requiredVersion=1.4.54de790f
+op.format.externalRegAddToToken.update.applet.requiredVersion=1.4.58768072
 op.format.externalRegAddToToken.update.symmetricKeys.enable=false
 op.format.externalRegAddToToken.update.symmetricKeys.requiredVersion=1
 op.enroll.allowUnknownToken=true
@@ -1187,7 +1187,7 @@ op.enroll.soKeyTemporary.update.applet.directory=[TPS_DIR]/applets
 op.enroll.soKeyTemporary.update.applet.emptyToken.enable=true
 op.enroll.soKeyTemporary.update.applet.enable=true
 op.enroll.soKeyTemporary.update.applet.encryption=true
-op.enroll.soKeyTemporary.update.applet.requiredVersion=1.4.54de790f
+op.enroll.soKeyTemporary.update.applet.requiredVersion=1.4.58768072
 op.enroll.soKeyTemporary.update.symmetricKeys.enable=false
 op.enroll.soKeyTemporary.update.symmetricKeys.requiredVersion=1
 op.enroll.soKey.tks.conn=tks1
@@ -1195,7 +1195,7 @@ op.enroll.soKey.update.applet.directory=[TPS_DIR]/applets
 op.enroll.soKey.update.applet.emptyToken.enable=true
 op.enroll.soKey.update.applet.enable=true
 op.enroll.soKey.update.applet.encryption=true
-op.enroll.soKey.update.applet.requiredVersion=1.4.54de790f
+op.enroll.soKey.update.applet.requiredVersion=1.4.58768072
 op.enroll.soKey.update.symmetricKeys.enable=false
 op.enroll.soKey.update.symmetricKeys.requiredVersion=1
 op.enroll.userKey.cuidMustMatchKDD=false
@@ -1529,7 +1529,7 @@ op.enroll.userKeyTemporary.update.applet.directory=[TPS_DIR]/applets
 op.enroll.userKeyTemporary.update.applet.emptyToken.enable=true
 op.enroll.userKeyTemporary.update.applet.enable=true
 op.enroll.userKeyTemporary.update.applet.encryption=true
-op.enroll.userKeyTemporary.update.applet.requiredVersion=1.4.54de790f
+op.enroll.userKeyTemporary.update.applet.requiredVersion=1.4.58768072
 op.enroll.userKeyTemporary.update.symmetricKeys.enable=false
 op.enroll.userKeyTemporary.update.symmetricKeys.requiredVersion=1
 op.enroll.userKey.tks.conn=tks1
@@ -1537,7 +1537,7 @@ op.enroll.userKey.update.applet.directory=[TPS_DIR]/applets
 op.enroll.userKey.update.applet.emptyToken.enable=true
 op.enroll.userKey.update.applet.enable=true
 op.enroll.userKey.update.applet.encryption=true
-op.enroll.userKey.update.applet.requiredVersion=1.4.54de790f
+op.enroll.userKey.update.applet.requiredVersion=1.4.58768072
 op.enroll.userKey.update.symmetricKeys.enable=false
 op.enroll.userKey.update.symmetricKeys.requiredVersion=1
 op.format.allowUnknownToken=true
@@ -1561,7 +1561,7 @@ op.format.cleanToken.tks.conn=tks1
 op.format.cleanToken.update.applet.directory=[TPS_DIR]/applets
 op.format.cleanToken.update.applet.emptyToken.enable=true
 op.format.cleanToken.update.applet.encryption=true
-op.format.cleanToken.update.applet.requiredVersion=1.4.54de790f
+op.format.cleanToken.update.applet.requiredVersion=1.4.58768072
 op.format.cleanToken.update.symmetricKeys.enable=false
 op.format.cleanToken.update.symmetricKeys.requiredVersion=1
 op.format.soCleanSOToken.cuidMustMatchKDD=false
@@ -1583,7 +1583,7 @@ op.format.soCleanSOToken.tks.conn=tks1
 op.format.soCleanSOToken.update.applet.directory=[TPS_DIR]/applets
 op.format.soCleanSOToken.update.applet.emptyToken.enable=true
 op.format.soCleanSOToken.update.applet.encryption=true
-op.format.soCleanSOToken.update.applet.requiredVersion=1.4.54de790f
+op.format.soCleanSOToken.update.applet.requiredVersion=1.4.58768072
 op.format.soCleanSOToken.update.symmetricKeys.enable=false
 op.format.soCleanSOToken.update.symmetricKeys.requiredVersion=1
 op.format.soCleanUserToken.cuidMustMatchKDD=false
@@ -1605,7 +1605,7 @@ op.format.soCleanUserToken.tks.conn=tks1
 op.format.soCleanUserToken.update.applet.directory=[TPS_DIR]/applets
 op.format.soCleanUserToken.update.applet.emptyToken.enable=true
 op.format.soCleanUserToken.update.applet.encryption=true
-op.format.soCleanUserToken.update.applet.requiredVersion=1.4.54de790f
+op.format.soCleanUserToken.update.applet.requiredVersion=1.4.58768072
 op.format.soCleanUserToken.update.symmetricKeys.enable=false
 op.format.soCleanUserToken.update.symmetricKeys.requiredVersion=1
 op.format.soKey.cuidMustMatchKDD=false
@@ -1627,7 +1627,7 @@ op.format.soKey.tks.conn=tks1
 op.format.soKey.update.applet.directory=[TPS_DIR]/applets
 op.format.soKey.update.applet.emptyToken.enable=true
 op.format.soKey.update.applet.encryption=true
-op.format.soKey.update.applet.requiredVersion=1.4.54de790f
+op.format.soKey.update.applet.requiredVersion=1.4.58768072
 op.format.soKey.update.symmetricKeys.enable=false
 op.format.soKey.update.symmetricKeys.requiredVersion=1
 op.format.soUserKey.cuidMustMatchKDD=false
@@ -1649,7 +1649,7 @@ op.format.soUserKey.tks.conn=tks1
 op.format.soUserKey.update.applet.directory=[TPS_DIR]/applets
 op.format.soUserKey.update.applet.emptyToken.enable=true
 op.format.soUserKey.update.applet.encryption=true
-op.format.soUserKey.update.applet.requiredVersion=1.4.54de790f
+op.format.soUserKey.update.applet.requiredVersion=1.4.58768072
 op.format.soUserKey.update.symmetricKeys.enable=false
 op.format.soUserKey.update.symmetricKeys.requiredVersion=1
 op.format.tokenKey.cuidMustMatchKDD=false
@@ -1671,7 +1671,7 @@ op.format.tokenKey.tks.conn=tks1
 op.format.tokenKey.update.applet.directory=[TPS_DIR]/applets
 op.format.tokenKey.update.applet.emptyToken.enable=true
 op.format.tokenKey.update.applet.encryption=true
-op.format.tokenKey.update.applet.requiredVersion=1.4.54de790f
+op.format.tokenKey.update.applet.requiredVersion=1.4.58768072
 op.format.tokenKey.update.symmetricKeys.enable=false
 op.format.tokenKey.update.symmetricKeys.requiredVersion=1
 op.format.userKey.cuidMustMatchKDD=false
@@ -1693,7 +1693,7 @@ op.format.userKey.tks.conn=tks1
 op.format.userKey.update.applet.directory=[TPS_DIR]/applets
 op.format.userKey.update.applet.emptyToken.enable=true
 op.format.userKey.update.applet.encryption=true
-op.format.userKey.update.applet.requiredVersion=1.4.54de790f
+op.format.userKey.update.applet.requiredVersion=1.4.58768072
 op.format.userKey.update.symmetricKeys.enable=false
 op.format.userKey.update.symmetricKeys.requiredVersion=1
 op.pinReset.mappingResolver=pinResetProfileMappingResolver
@@ -1714,7 +1714,7 @@ op.pinReset.userKey.update.applet.directory=[TPS_DIR]/applets
 op.pinReset.userKey.update.applet.emptyToken.enable=true
 op.pinReset.userKey.update.applet.enable=false
 op.pinReset.userKey.update.applet.encryption=true
-op.pinReset.userKey.update.applet.requiredVersion=1.4.54de790f
+op.pinReset.userKey.update.applet.requiredVersion=1.4.58768072
 op.pinReset.userKey.update.symmetricKeys.enable=false
 op.pinReset.userKey.update.symmetricKeys.requiredVersion=1
 os.serverName=cert-[PKI_INSTANCE_NAME]