ECA-8029 Remove Hard Tokens, Hard Token Profiles and Hard Token Issue…

…rs from EJBCA git-svn-id: https://svn.cesecore.eu/svn/ejbca-restricted/trunk/ejbca@32112 37aeb1de-b14b-0410-9a0e-82b28170d228
Keyfactor · Apr 11, 2019 · a0c4e17 · a0c4e17
1 parent f066c51
commit a0c4e17
Show file tree

Hide file tree

Showing 267 changed files with 1,061 additions and 10,301 deletions.
diff --git a/bin/extra/ejbca-setup.sh b/bin/extra/ejbca-setup.sh
@@ -1230,12 +1230,6 @@ web.contentencoding=UTF-8
 # The language configuration that should be used internally for logging, exceptions and approval
 # notifications has been moved to ejbca.properties from EJBCA 3.10.
 
-# Setting to indicate if the secret information stored on hard tokens (i.e initial PIN/PUK codes) should
-# be displayed for the administrators. If false only non-sensitive information is displayed.
-# Values should be "true" or "false".
-# Default = true
-#hardtoken.diplaysensitiveinfo=true
-
 # Show links to the EJBCA documentation. The links can either point to internally deployed
 # documentation on the server or any exteral location like ejbca.org.
 # Default = internal

diff --git a/conf/web.properties.sample b/conf/web.properties.sample
@@ -111,12 +111,6 @@ httpsserver.dn=CN=${httpsserver.hostname},O=EJBCA Sample,C=SE
 # The language configuration that should be used internally for logging, exceptions and approval
 # notifications has been moved to cesecore.properties from EJBCA 5.
 
-# Setting to indicate if the secret information stored on hard tokens (i.e initial PIN/PUK codes) should
-# be displayed for the administrators. If false only non-sensitive information is displayed.
-# Values should be "true" or "false".
-# Default = true
-#hardtoken.diplaysensitiveinfo=true
-
 # Show links to the EJBCA documentation. The links can either point to internally deployed
 # documentation on the server or any exteral location like ejbca.org.
 # Default = internal

diff --git a/doc/howto/HOWTO-database.txt b/doc/howto/HOWTO-database.txt
@@ -375,10 +375,6 @@ CertificateData
 CertificateProfileData
 EndEntityProfileData
 GlobalConfigurationData
-HardTokenCertificateMap
-HardTokenData
-HardTokenIssuerData
-HardTokenPropertyData
 KeyRecoveryData
 LogConfigurationData
 AuditRecordData

diff --git a/doc/sql-scripts/create-tables-ejbca-db2.sql b/doc/sql-scripts/create-tables-ejbca-db2.sql
@@ -225,57 +225,6 @@ CREATE TABLE GlobalConfigurationData (
     PRIMARY KEY (configurationId)
 );
 
-CREATE TABLE HardTokenCertificateMap (
-    certificateFingerprint VARCHAR(254) NOT NULL,
-    rowProtection CLOB(10K),
-    rowVersion INTEGER NOT NULL,
-    tokenSN VARCHAR(254) NOT NULL,
-    PRIMARY KEY (certificateFingerprint)
-);
-
-CREATE TABLE HardTokenData (
-    tokenSN VARCHAR(254) NOT NULL,
-    cTime BIGINT NOT NULL,
-    data BLOB(200K),
-    mTime BIGINT NOT NULL,
-    rowProtection CLOB(10K),
-    rowVersion INTEGER NOT NULL,
-    significantIssuerDN VARCHAR(254),
-    tokenType INTEGER NOT NULL,
-    username VARCHAR(254),
-    PRIMARY KEY (tokenSN)
-);
-
-CREATE TABLE HardTokenIssuerData (
-    id INTEGER NOT NULL,
-    adminGroupId INTEGER NOT NULL,
-    alias VARCHAR(254) NOT NULL,
-    data BLOB(200K) NOT NULL,
-    rowProtection CLOB(10K),
-    rowVersion INTEGER NOT NULL,
-    PRIMARY KEY (id)
-);
-
-CREATE TABLE HardTokenProfileData (
-    id INTEGER NOT NULL,
-    data CLOB,
-    name VARCHAR(254) NOT NULL,
-    rowProtection CLOB(10K),
-    rowVersion INTEGER NOT NULL,
-    updateCounter INTEGER NOT NULL,
-    PRIMARY KEY (id)
-);
-
-CREATE TABLE HardTokenPropertyData (
-    id VARCHAR(80) NOT NULL,
-    property VARCHAR(254) NOT NULL,
-    rowProtection CLOB(10K),
-    rowVersion INTEGER NOT NULL,
-    value VARCHAR(254),
-    PRIMARY KEY (id,
-    property)
-);
-
 CREATE TABLE InternalKeyBindingData (
     id INTEGER NOT NULL,
     certificateId VARCHAR(254),
@@ -406,7 +355,6 @@ CREATE TABLE UserData (
     clearPassword VARCHAR(254),
     endEntityProfileId INTEGER NOT NULL,
     extendedInformationData CLOB,
-    hardTokenIssuerId INTEGER NOT NULL,
     keyStorePassword VARCHAR(254),
     passwordHash VARCHAR(254),
     rowProtection CLOB(10K),

diff --git a/doc/sql-scripts/create-tables-ejbca-derby.sql b/doc/sql-scripts/create-tables-ejbca-derby.sql
@@ -225,57 +225,6 @@ CREATE TABLE GlobalConfigurationData (
     PRIMARY KEY (configurationId)
 );
 
-CREATE TABLE HardTokenCertificateMap (
-    certificateFingerprint VARCHAR(256) NOT NULL,
-    rowProtection CLOB(10 K),
-    rowVersion INTEGER NOT NULL,
-    tokenSN VARCHAR(256) NOT NULL,
-    PRIMARY KEY (certificateFingerprint)
-);
-
-CREATE TABLE HardTokenData (
-    tokenSN VARCHAR(256) NOT NULL,
-    cTime BIGINT NOT NULL,
-    data BLOB,
-    mTime BIGINT NOT NULL,
-    rowProtection CLOB(10 K),
-    rowVersion INTEGER NOT NULL,
-    significantIssuerDN VARCHAR(256),
-    tokenType INTEGER NOT NULL,
-    username VARCHAR(256),
-    PRIMARY KEY (tokenSN)
-);
-
-CREATE TABLE HardTokenIssuerData (
-    id INTEGER NOT NULL,
-    adminGroupId INTEGER NOT NULL,
-    alias VARCHAR(256) NOT NULL,
-    data BLOB NOT NULL,
-    rowProtection CLOB(10 K),
-    rowVersion INTEGER NOT NULL,
-    PRIMARY KEY (id)
-);
-
-CREATE TABLE HardTokenProfileData (
-    id INTEGER NOT NULL,
-    data CLOB,
-    name VARCHAR(256) NOT NULL,
-    rowProtection CLOB(10 K),
-    rowVersion INTEGER NOT NULL,
-    updateCounter INTEGER NOT NULL,
-    PRIMARY KEY (id)
-);
-
-CREATE TABLE HardTokenPropertyData (
-    id VARCHAR(256) NOT NULL,
-    property VARCHAR(256) NOT NULL,
-    rowProtection CLOB(10 K),
-    rowVersion INTEGER NOT NULL,
-    value VARCHAR(256),
-    PRIMARY KEY (id,
-    property)
-);
-
 CREATE TABLE InternalKeyBindingData (
     id INTEGER NOT NULL,
     certificateId VARCHAR(256),
@@ -406,7 +355,6 @@ CREATE TABLE UserData (
     clearPassword VARCHAR(256),
     endEntityProfileId INTEGER NOT NULL,
     extendedInformationData CLOB,
-    hardTokenIssuerId INTEGER NOT NULL,
     keyStorePassword VARCHAR(256),
     passwordHash VARCHAR(256),
     rowProtection CLOB(10 K),

diff --git a/doc/sql-scripts/create-tables-ejbca-h2.sql b/doc/sql-scripts/create-tables-ejbca-h2.sql
@@ -198,57 +198,6 @@ CREATE TABLE GlobalConfigurationData (
     PRIMARY KEY (configurationId)
 );
 
-CREATE TABLE HardTokenCertificateMap (
-    certificateFingerprint VARCHAR(256) NOT NULL,
-    rowProtection VARCHAR,
-    rowVersion INTEGER NOT NULL,
-    tokenSN VARCHAR(256) NOT NULL,
-    PRIMARY KEY (certificateFingerprint)
-);
-
-CREATE TABLE HardTokenData (
-    tokenSN VARCHAR(256) NOT NULL,
-    cTime BIGINT NOT NULL,
-    data VARBINARY,
-    mTime BIGINT NOT NULL,
-    rowProtection VARCHAR,
-    rowVersion INTEGER NOT NULL,
-    significantIssuerDN VARCHAR(256),
-    tokenType INTEGER NOT NULL,
-    username VARCHAR(256),
-    PRIMARY KEY (tokenSN)
-);
-
-CREATE TABLE HardTokenIssuerData (
-    id INTEGER NOT NULL,
-    adminGroupId INTEGER NOT NULL,
-    alias VARCHAR(256) NOT NULL,
-    data VARBINARY NOT NULL,
-    rowProtection VARCHAR,
-    rowVersion INTEGER NOT NULL,
-    PRIMARY KEY (id)
-);
-
-CREATE TABLE HardTokenProfileData (
-    id INTEGER NOT NULL,
-    data VARCHAR,
-    name VARCHAR(256) NOT NULL,
-    rowProtection VARCHAR,
-    rowVersion INTEGER NOT NULL,
-    updateCounter INTEGER NOT NULL,
-    PRIMARY KEY (id)
-);
-
-CREATE TABLE HardTokenPropertyData (
-    id VARCHAR(256) NOT NULL,
-    property VARCHAR(256) NOT NULL,
-    rowProtection VARCHAR,
-    rowVersion INTEGER NOT NULL,
-    value VARCHAR(256),
-    PRIMARY KEY (id,
-    property)
-);
-
 CREATE TABLE InternalKeyBindingData (
     id INTEGER NOT NULL,
     certificateId VARCHAR(256),
@@ -379,7 +328,6 @@ CREATE TABLE UserData (
     clearPassword VARCHAR(256),
     endEntityProfileId INTEGER NOT NULL,
     extendedInformationData VARCHAR,
-    hardTokenIssuerId INTEGER NOT NULL,
     keyStorePassword VARCHAR(256),
     passwordHash VARCHAR(256),
     rowProtection VARCHAR,

diff --git a/doc/sql-scripts/create-tables-ejbca-hsqldb.sql b/doc/sql-scripts/create-tables-ejbca-hsqldb.sql
@@ -198,57 +198,6 @@ CREATE TABLE GlobalConfigurationData (
     PRIMARY KEY (configurationId)
 );
 
-CREATE TABLE HardTokenCertificateMap (
-    certificateFingerprint VARCHAR(256) NOT NULL,
-    rowProtection VARCHAR,
-    rowVersion INTEGER NOT NULL,
-    tokenSN VARCHAR(256) NOT NULL,
-    PRIMARY KEY (certificateFingerprint)
-);
-
-CREATE TABLE HardTokenData (
-    tokenSN VARCHAR(256) NOT NULL,
-    cTime BIGINT NOT NULL,
-    data VARBINARY,
-    mTime BIGINT NOT NULL,
-    rowProtection VARCHAR,
-    rowVersion INTEGER NOT NULL,
-    significantIssuerDN VARCHAR(256),
-    tokenType INTEGER NOT NULL,
-    username VARCHAR(256),
-    PRIMARY KEY (tokenSN)
-);
-
-CREATE TABLE HardTokenIssuerData (
-    id INTEGER NOT NULL,
-    adminGroupId INTEGER NOT NULL,
-    alias VARCHAR(256) NOT NULL,
-    data VARBINARY NOT NULL,
-    rowProtection VARCHAR,
-    rowVersion INTEGER NOT NULL,
-    PRIMARY KEY (id)
-);
-
-CREATE TABLE HardTokenProfileData (
-    id INTEGER NOT NULL,
-    data VARCHAR,
-    name VARCHAR(256) NOT NULL,
-    rowProtection VARCHAR,
-    rowVersion INTEGER NOT NULL,
-    updateCounter INTEGER NOT NULL,
-    PRIMARY KEY (id)
-);
-
-CREATE TABLE HardTokenPropertyData (
-    id VARCHAR(256) NOT NULL,
-    property VARCHAR(256) NOT NULL,
-    rowProtection VARCHAR,
-    rowVersion INTEGER NOT NULL,
-    value VARCHAR(256),
-    PRIMARY KEY (id,
-    property)
-);
-
 CREATE TABLE InternalKeyBindingData (
     id INTEGER NOT NULL,
     certificateId VARCHAR(256),
@@ -379,7 +328,6 @@ CREATE TABLE UserData (
     clearPassword VARCHAR(256),
     endEntityProfileId INTEGER NOT NULL,
     extendedInformationData VARCHAR,
-    hardTokenIssuerId INTEGER NOT NULL,
     keyStorePassword VARCHAR(256),
     passwordHash VARCHAR(256),
     rowProtection VARCHAR,

diff --git a/doc/sql-scripts/create-tables-ejbca-informix.sql b/doc/sql-scripts/create-tables-ejbca-informix.sql
@@ -198,57 +198,6 @@ CREATE TABLE GlobalConfigurationData (
     PRIMARY KEY (configurationId)
 );
 
-CREATE TABLE HardTokenCertificateMap (
-    certificateFingerprint VARCHAR(255,0) NOT NULL,
-    rowProtection TEXT,
-    rowVersion INTEGER NOT NULL,
-    tokenSN VARCHAR(255,0) NOT NULL,
-    PRIMARY KEY (certificateFingerprint)
-);
-
-CREATE TABLE HardTokenData (
-    tokenSN VARCHAR(255,0) NOT NULL,
-    cTime DECIMAL(18,0) NOT NULL,
-    data BLOB,
-    mTime DECIMAL(18,0) NOT NULL,
-    rowProtection TEXT,
-    rowVersion INTEGER NOT NULL,
-    significantIssuerDN VARCHAR(255,0),
-    tokenType INTEGER NOT NULL,
-    username VARCHAR(255,0),
-    PRIMARY KEY (tokenSN)
-);
-
-CREATE TABLE HardTokenIssuerData (
-    id INTEGER NOT NULL,
-    adminGroupId INTEGER NOT NULL,
-    alias VARCHAR(255,0) NOT NULL,
-    data BLOB NOT NULL,
-    rowProtection TEXT,
-    rowVersion INTEGER NOT NULL,
-    PRIMARY KEY (id)
-);
-
-CREATE TABLE HardTokenProfileData (
-    id INTEGER NOT NULL,
-    data TEXT,
-    name VARCHAR(255,0) NOT NULL,
-    rowProtection TEXT,
-    rowVersion INTEGER NOT NULL,
-    updateCounter INTEGER NOT NULL,
-    PRIMARY KEY (id)
-);
-
-CREATE TABLE HardTokenPropertyData (
-    id VARCHAR(255,0) NOT NULL,
-    property VARCHAR(255,0) NOT NULL,
-    rowProtection TEXT,
-    rowVersion INTEGER NOT NULL,
-    value VARCHAR(255,0),
-    PRIMARY KEY (id,
-    property)
-);
-
 CREATE TABLE InternalKeyBindingData (
     id INTEGER NOT NULL,
     certificateId VARCHAR(255,0),
@@ -379,7 +328,6 @@ CREATE TABLE UserData (
     clearPassword VARCHAR(255,0),
     endEntityProfileId INTEGER NOT NULL,
     extendedInformationData TEXT,
-    hardTokenIssuerId INTEGER NOT NULL,
     keyStorePassword VARCHAR(255,0),
     passwordHash VARCHAR(255,0),
     rowProtection TEXT,