openstack/barbican
Code Issues Proposed changes

Merge "Fix the typo in the files"

Browse Source
This commit is contained in:
Jenkins 2016-08-16 15:38:24 +00:00 committed by Gerrit Code Review
commit 2a5fd3bdfb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
barbican/cmd/barbican_manage.py
View File

@ -183,7 +183,7 @@ class HSMCommands(object):
@args('--passphrase', metavar='<passphrase>', default=None, required=True,
help='Password to login to PKCS11 session')
@args('--label', '-L', metavar='<label>', default='primarymkek',
help='The label of the Matser HMAC Key')
help='The label of the Master HMAC Key')
@args('--length', '-l', metavar='<length>', default=32,
help='The length of the Master HMAC Key (default is 32)')
def gen_hmac(self, passphrase, libpath=None, slotid=None, label=None,

4
barbican/plugin/snakeoil_ca.py
View File

@ -39,11 +39,11 @@ snakeoil_ca_plugin_group = cfg.OptGroup(name='snakeoil_ca_plugin',
snakeoil_ca_plugin_opts = [
cfg.StrOpt('ca_cert_path',
help=u._('Path to CA certicate file')),
help=u._('Path to CA certificate file')),
cfg.StrOpt('ca_cert_key_path',
help=u._('Path to CA certificate key file')),
cfg.StrOpt('ca_cert_chain_path',
help=u._('Path to CA certicate chain file')),
help=u._('Path to CA certificate chain file')),
cfg.StrOpt('ca_cert_pkcs7_path',
help=u._('Path to CA chain pkcs7 file')),
cfg.StrOpt('subca_cert_key_directory',