mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-16 22:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pass ConfigFile object as parameter for MultiConfig constructor

Browse Source 
Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>
This commit is contained in:
Gabor Mezei 2024-06-28 17:27:19 +02:00
parent 8d72ac60b3
commit 3e2a550f12
No known key found for this signature in database
GPG Key ID: 6310BD29B0BFF98C
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/config.py
View File

@ -631,10 +631,16 @@ class MultiConfig(Config):
and modify the configuration.
"""
def __init__(self, mbedtls_filename=None, crypto__filename=None):
def __init__(self, *configs):
super().__init__()
self.mbedtls_configfile = MbedTLSConfigFile(mbedtls_filename)
self.crypto_configfile = CryptoConfigFile(crypto__filename)
for config in configs:
if isinstance(config, MbedTLSConfigFile):
self.mbedtls_configfile = config
elif isinstance(config, CryptoConfigFile):
self.crypto_configfile = config
else:
raise ValueError(f'Invalid configfile: {config}')
self.settings.update({name: Setting(active, name, value, section, configfile)
for configfile in [self.mbedtls_configfile, self.crypto_configfile]
for (active, name, value, section) in configfile.parse_file()})
@ -823,7 +829,7 @@ if __name__ == '__main__':
excluding X.509 and TLS.""")
args = parser.parse_args()
config = MultiConfig(args.file, args.cryptofile)
config = MultiConfig(MbedTLSConfigFile(args.file), CryptoConfigFile(args.cryptofile))
if args.command is None:
parser.print_help()
return 1