Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor set_signing_algs_for_pss() #4505

Merged
merged 1 commit into from
Jul 19, 2023
Merged

Refactor set_signing_algs_for_pss() #4505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions base/server/python/pki/server/deployment/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,47 @@ def create_server_xml(self, instance):

server_config.save()

def update_rsa_pss_algorithm(self, cert_id, alg_type):

param = 'pki_%s_%s_algorithm' % (cert_id, alg_type)
algorithm = self.mdict[param]

# if algorithm is XXXwithRSA, change it into XXXwithRSA/PSS
if not re.search(r'withRSA$', algorithm):
return

self.mdict[param] = '%s/PSS' % algorithm

def update_rsa_pss_algorithms(self, subsystem):

logger.info('Updating RSA-PSS algorithms')

if subsystem.type == 'CA':
self.update_rsa_pss_algorithm('ca_signing', 'key')
self.update_rsa_pss_algorithm('ca_signing', 'signing')

if subsystem.type == 'KRA':
self.update_rsa_pss_algorithm('storage', 'key')
self.update_rsa_pss_algorithm('storage', 'signing')

self.update_rsa_pss_algorithm('transport', 'key')
self.update_rsa_pss_algorithm('transport', 'signing')

if subsystem.type in ['CA', 'OCSP']:
self.update_rsa_pss_algorithm('ocsp_signing', 'key')
self.update_rsa_pss_algorithm('ocsp_signing', 'signing')

self.update_rsa_pss_algorithm('audit_signing', 'key')
self.update_rsa_pss_algorithm('audit_signing', 'signing')

self.update_rsa_pss_algorithm('sslserver', 'key')
self.update_rsa_pss_algorithm('sslserver', 'signing')

self.update_rsa_pss_algorithm('subsystem', 'key')
self.update_rsa_pss_algorithm('subsystem', 'signing')

self.update_rsa_pss_algorithm('admin', 'key')

def get_key_params(self, cert_id):

key_type = self.mdict['pki_%s_key_type' % cert_id]
Expand Down
91 changes: 3 additions & 88 deletions base/server/python/pki/server/deployment/scriptlets/security_databases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,11 @@ def spawn(self, deployer):
instance = self.instance
instance.load()

usePSSForRSASigningAlg = \
deployer.mdict['pki_use_pss_rsa_signing_algorithm']

if usePSSForRSASigningAlg == "True":
self.set_signing_algs_for_pss(deployer)

subsystem = instance.get_subsystem(deployer.mdict['pki_subsystem'].lower())

if config.str2bool(deployer.mdict['pki_use_pss_rsa_signing_algorithm']):
deployer.update_rsa_pss_algorithms(subsystem)

if config.str2bool(deployer.mdict['pki_hsm_enable']):
hsm_token = deployer.mdict['pki_token_name']
subsystem.config['preop.module.token'] = hsm_token
Expand Down Expand Up @@ -436,88 +433,6 @@ def spawn(self, deployer):
finally:
nssdb.close()

def set_signing_algs_for_pss(self, deployer):
# We know that the use pss flag is true.
# Only modify SHAXXXwithRSA series of algs for PSS.
logger.debug('In security_databases.set_signing_algs_for_pss')
if ('pki_admin_key_algorithm' in deployer.mdict):
if ('RSA' in deployer.mdict['pki_admin_key_algorithm'] and
'PSS' not in deployer.mdict['pki_admin_key_algorithm']):
deployer.mdict['pki_admin_key_algorithm'] = \
deployer.mdict['pki_admin_key_algorithm'] + '/PSS'
if ('pki_audit_signing_key_algorithm' in deployer.mdict):
if ('RSA' in deployer.mdict['pki_audit_signing_key_algorithm'] and
'PSS' not in deployer.mdict['pki_audit_signing_key_algorithm']):
deployer.mdict['pki_audit_signing_key_algorithm'] = \
deployer.mdict['pki_audit_signing_key_algorithm'] + '/PSS'
if ('pki_audit_signing_signing_algorithm' in deployer.mdict):
if ('RSA' in deployer.mdict['pki_audit_signing_signing_algorithm'] and
'PSS' not in deployer.mdict['pki_audit_signing_signing_algorithm']):
deployer.mdict['pki_audit_signing_signing_algorithm'] = \
deployer.mdict['pki_audit_signing_signing_algorithm'] + '/PSS'
if ('pki_ca_signing_key_algorithm' in deployer.mdict):
if ('RSA' in deployer.mdict['pki_ca_signing_key_algorithm'] and
'PSS' not in deployer.mdict['pki_ca_signing_key_algorithm']):
deployer.mdict['pki_ca_signing_key_algorithm'] = \
deployer.mdict['pki_ca_signing_key_algorithm'] + '/PSS'
if ('pki_ca_signing_signing_algorithm' in deployer.mdict):
if ('RSA' in deployer.mdict['pki_ca_signing_signing_algorithm'] and
'PSS' not in deployer.mdict['pki_ca_signing_signing_algorithm']):
deployer.mdict['pki_ca_signing_signing_algorithm'] = \
deployer.mdict['pki_ca_signing_signing_algorithm'] + '/PSS'
if ('pki_ocsp_signing_key_algorithm' in deployer.mdict):
if ('RSA' in deployer.mdict['pki_ocsp_signing_key_algorithm'] and
'PSS' not in deployer.mdict['pki_ocsp_signing_key_algorithm']):
deployer.mdict['pki_ocsp_signing_key_algorithm'] = \
deployer.mdict['pki_ocsp_signing_key_algorithm'] + '/PSS'
if ('pki_ocsp_signing_signing_algorithm' in deployer.mdict):
if ('RSA' in deployer.mdict['pki_ocsp_signing_signing_algorithm'] and
'PSS' not in deployer.mdict['pki_ocsp_signing_signing_algorithm']):
deployer.mdict['pki_ocsp_signing_signing_algorithm'] = \
deployer.mdict['pki_ocsp_signing_signing_algorithm'] + '/PSS'
if ('pki_transport_signing_algorithm' in deployer.mdict):
if ('pki_transport_signing_algorithm' in deployer.mdict):
if ('RSA' in deployer.mdict['pki_transport_signing_algorithm'] and
'PSS' not in deployer.mdict['pki_transport_signing_algorithm']):
deployer.mdict['pki_transport_signing_algorithm'] = \
deployer.mdict['pki_transport_signing_algorithm'] + '/PSS'
if ('pki_transport_key_algorithm' in deployer.mdict):
if ('pki_transport_key_algorithm' in deployer.mdict):
if ('RSA' in deployer.mdict['pki_transport_key_algorithm'] and
'PSS' not in deployer.mdict['pki_transport_key_algorithm']):
deployer.mdict['pki_transport_key_algorithm'] = \
deployer.mdict['pki_transport_key_algorithm'] + '/PSS'
if ('pki_sslserver_key_algorithm' in deployer.mdict):
if ('RSA' in deployer.mdict['pki_sslserver_key_algorithm'] and
'PSS' not in deployer.mdict['pki_sslserver_key_algorithm']):
deployer.mdict['pki_sslserver_key_algorithm'] = \
deployer.mdict['pki_sslserver_key_algorithm'] + '/PSS'
if ('pki_sslserver_signing_algorithm' in deployer.mdict):
if ('RSA' in deployer.mdict['pki_sslserver_signing_algorithm'] and
'PSS' not in deployer.mdict['pki_sslserver_signing_algorithm']):
deployer.mdict['pki_sslserver_signing_algorithm'] = \
deployer.mdict['pki_sslserver_signing_algorithm'] + '/PSS'
if ('pki_storage_signing_algorithm' in deployer.mdict):
if ('RSA' in deployer.mdict['pki_storage_signing_algorithm'] and
'PSS' not in deployer.mdict['pki_storage_signing_algorithm']):
deployer.mdict['pki_storage_signing_algorithm'] = \
deployer.mdict['pki_storage_signing_algorithm'] + '/PSS'
if ('pki_storage_key_algorithm' in deployer.mdict):
if ('RSA' in deployer.mdict['pki_storage_key_algorithm'] and
'PSS' not in deployer.mdict['pki_storage_key_algorithm']):
deployer.mdict['pki_storage_key_algorithm'] = \
deployer.mdict['pki_storage_key_algorithm'] + '/PSS'
if ('pki_subsystem_key_algorithm' in deployer.mdict):
if ('RSA' in deployer.mdict['pki_subsystem_key_algorithm'] and
'PSS' not in deployer.mdict['pki_subsystem_key_algorithm']):
deployer.mdict['pki_subsystem_key_algorithm'] = \
deployer.mdict['pki_subsystem_key_algorithm'] + '/PSS'
if ('pki_subsystem_signing_algorithm' in deployer.mdict):
if ('RSA' in deployer.mdict['pki_subsystem_signing_algorithm'] and
'PSS' not in deployer.mdict['pki_subsystem_signing_algorithm']):
deployer.mdict['pki_subsystem_signing_algorithm'] = \
deployer.mdict['pki_subsystem_signing_algorithm'] + '/PSS'

def update_external_certs_conf(self, external_path, deployer):
external_certs = pki.server.instance.PKIInstance.read_external_certs(
external_path)
Expand Down
Loading