summaryrefslogtreecommitdiffstats
path: root/base/tks
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2013-09-26 11:53:23 -0400
committerAde Lee <alee@redhat.com>2013-09-30 11:52:18 -0400
commite9c373e57675c660b79c8998d724a9627b26ebda (patch)
tree3b065cfe006a28073de8813242181c205869718f /base/tks
parent6eaf2c01c211cf06053c82b1e296909ce8d874b6 (diff)
downloadpki-e9c373e57675c660b79c8998d724a9627b26ebda.tar.gz
pki-e9c373e57675c660b79c8998d724a9627b26ebda.tar.xz
pki-e9c373e57675c660b79c8998d724a9627b26ebda.zip
Modify TKS self tests and execution to use new shared secret names
The self tests and TokenServlet are modified to use the new shared secret names. A parameter has been added to allow legacy systems to continue running as-is. With a new system, the TKS self test will not fail on startup if no shared secret keys are configured. It will fail, however, if the keys are configured, but the ComputeSessionKey operation fails.
Diffstat (limited to 'base/tks')
-rw-r--r--base/tks/shared/conf/CS.cfg.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/base/tks/shared/conf/CS.cfg.in b/base/tks/shared/conf/CS.cfg.in
index c0ee3fa0c..9a7ed7f05 100644
--- a/base/tks/shared/conf/CS.cfg.in
+++ b/base/tks/shared/conf/CS.cfg.in
@@ -323,6 +323,7 @@ tks.defaultSlot=Internal Key Storage Token
tks.drm_transport_cert_nickname=
tks.master_key_prefix=
tks.tksSharedSymKeyName=sharedSecret
+tks.useNewSharedSecretNames=true
tks.useDefaultSlot=true
usrgrp._000=##
usrgrp._001=## User/Group