summaryrefslogtreecommitdiffstats
path: root/base/tps/shared/conf
diff options
context:
space:
mode:
Diffstat (limited to 'base/tps/shared/conf')
-rw-r--r--base/tps/shared/conf/CS.cfg.in4
-rw-r--r--base/tps/shared/conf/token-states.properties12
2 files changed, 8 insertions, 8 deletions
diff --git a/base/tps/shared/conf/CS.cfg.in b/base/tps/shared/conf/CS.cfg.in
index b5441a0a1..2b451defc 100644
--- a/base/tps/shared/conf/CS.cfg.in
+++ b/base/tps/shared/conf/CS.cfg.in
@@ -1954,7 +1954,7 @@ tokendb._064=# is set to YES. Otherwise, re-enrollment is not
tokendb._065=# allowed.
tokendb._066=# tokendb.allowedTransitions:
tokendb._067=# - has transitions between the following states
-tokendb._068=# UNINITIALIZED = 0,
+tokendb._068=# READY = 0,
tokendb._069=# DAMAGED = 1,
tokendb._070=# PERM_LOST = 2,
tokendb._071=# SUSPENDED = 3,
@@ -2023,7 +2023,7 @@ tps._005=# tps.cert.subsystem.nickname=xxx
tps._007=# tps.cert.audit_signing.nickname=xxx
tps._008=# operations.allowedTransitions:
tps._009=# - token operations, like formatting and enrollment have transitions between the following states
-tps._010=# UNINITIALIZED = 0,
+tps._010=# READY = 0,
tps._011=# DAMAGED = 1,
tps._012=# PERM_LOST = 2,
tps._013=# SUSPENDED = 3,
diff --git a/base/tps/shared/conf/token-states.properties b/base/tps/shared/conf/token-states.properties
index 3c7e7d6da..e6366286f 100644
--- a/base/tps/shared/conf/token-states.properties
+++ b/base/tps/shared/conf/token-states.properties
@@ -1,5 +1,5 @@
# Token states
-UNINITIALIZED = Uninitialized
+READY = Uninitialized/ready
ACTIVE = Active
SUSPENDED = Temporarily lost/suspended
PERM_LOST = Permanently lost
@@ -8,14 +8,14 @@ TEMP_LOST_PERM_LOST = Temporarily lost then permanently lost
TERMINATED = Terminated
# Token state transitions
-UNINITIALIZED.DAMAGED = This token has been physically damaged.
-UNINITIALIZED.PERM_LOST = This token has been permanently lost.
-UNINITIALIZED.SUSPENDED = This token has been temporarily lost/suspended.
-UNINITIALIZED.TERMINATED = This token has been terminated.
+READY.DAMAGED = This token has been physically damaged.
+READY.PERM_LOST = This token has been permanently lost.
+READY.SUSPENDED = This token has been temporarily lost/suspended.
+READY.TERMINATED = This token has been terminated.
SUSPENDED.ACTIVE = This temporarily lost/suspended token has been found.
SUSPENDED.PERM_LOST = This temporarily lost/suspended token has become permanently lost.
SUSPENDED.TERMINATED = This temporarily lost/suspended token has been terminated.
-SUSPENDED.UNINITIALIZED = This temporarily lost/suspended token has been found.
+SUSPENDED.READY = This temporarily lost/suspended token has been found.
ACTIVE.DAMAGED = This token has been physically damaged.
ACTIVE.PERM_LOST = This token has been permanently lost.
ACTIVE.SUSPENDED = This token has been temporarily lost/suspended.