Renaming PKCS#11

itss.py

@@ -52,9 +52,9 @@ def __init__(self, tenant, directory, ea_url, aa_url, hsm):
 		elif hsm == 'cicada':
 			import itss.hsm_cicada
 			self.HSM = itss.hsm_cicada.CicadaHSM()
-		elif hsm == 'yubikey':
-			import itss.hsm_yubikey
-			self.HSM = itss.hsm_yubikey.YubikeyHSM()
+		elif hsm == 'pkcs11':
+			import itss.hsm_pkcs11
+			self.HSM = itss.hsm_pkcs11.PKCS11HSM()
 		else:
 			raise RuntimeError("Unknown/unsupported HSM '{}'".format(hsm))
 
@@ -344,7 +344,7 @@ def main():
 	parser.add_argument('-e', '--ea-url', default="https://via.teskalabs.com", help='Base URL of the Enrollment Authority')
 	parser.add_argument('-a', '--aa-url', default="https://via.teskalabs.com", help='Base URL of the Authorization Authority')
 	parser.add_argument('-i', '--enrollment-id', help='specify a custom enrollment ID')
-	parser.add_argument('-H', '--hsm', default="emulated", choices=['cicada', 'yubikey', 'emulated'], help='specify the HSM to use for a private key.')
+	parser.add_argument('-H', '--hsm', default="emulated", choices=['cicada', 'pkcs11', 'emulated'], help='specify the HSM to use for a private key.')
 	parser.add_argument('--g5-sim', default="239.1.1.1 5007 32 auto", help='specify a configuration of G5 simulator')
 	parser.add_argument('-t', '--tenant', default='c-its', help='specify a SeaCat tenant')
 

itss/hsm_yubikey.py → itss/hsm_pkcs11.py

@@ -4,7 +4,7 @@
 
 from .hsm_abc import HSM
 
-class YubikeyHSM(HSM):
+class PKCS11HSM(HSM):
 
 	def __init__(self):
 		self._privateKey = None