Recognize kdf_alg as KDF algorithm parameter name

This commit is contained in:
Gilles Peskine 2019-01-04 19:46:31 +01:00 committed by Darryl Green
parent 6d194bd92b
commit 17542086ab

View file

@ -63,6 +63,7 @@ when applicable.'''
# Hard-coded value for unknown algorithms # Hard-coded value for unknown algorithms
self.hash_algorithms = set(['0x010000ff']) self.hash_algorithms = set(['0x010000ff'])
self.mac_algorithms = set(['0x02ff00ff']) self.mac_algorithms = set(['0x02ff00ff'])
self.kdf_algorithms = set(['0x300000ff', '0x310000ff'])
# For AEAD algorithms, the only variability is over the tag length, # For AEAD algorithms, the only variability is over the tag length,
# and this only applies to known algorithms, so don't test an # and this only applies to known algorithms, so don't test an
# unknown algorithm. # unknown algorithm.
@ -88,6 +89,7 @@ when applicable.'''
Call this after parsing all the inputs.''' Call this after parsing all the inputs.'''
self.arguments_for['hash_alg'] = sorted(self.hash_algorithms) self.arguments_for['hash_alg'] = sorted(self.hash_algorithms)
self.arguments_for['mac_alg'] = sorted(self.mac_algorithms) self.arguments_for['mac_alg'] = sorted(self.mac_algorithms)
self.arguments_for['kdf_alg'] = sorted(self.kdf_algorithms)
self.arguments_for['aead_alg'] = sorted(self.aead_algorithms) self.arguments_for['aead_alg'] = sorted(self.aead_algorithms)
self.arguments_for['curve'] = sorted(self.ecc_curves) self.arguments_for['curve'] = sorted(self.ecc_curves)