mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-03-27 23:37:08 +00:00
Move variable into generated bash
Move the DATA_FILES_PATH_VAR variable into the generated bash rather than only variablising it in the python that generates the test script. Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
parent
f36b7bca5e
commit
b51ed61726
@ -16,23 +16,22 @@ import argparse
|
|||||||
import itertools
|
import itertools
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
DATA_FILES_PATH = '../framework/data_files'
|
|
||||||
# define certificates configuration entry
|
# define certificates configuration entry
|
||||||
Certificate = namedtuple("Certificate", ['cafile', 'certfile', 'keyfile'])
|
Certificate = namedtuple("Certificate", ['cafile', 'certfile', 'keyfile'])
|
||||||
# define the certificate parameters for signature algorithms
|
# define the certificate parameters for signature algorithms
|
||||||
CERTIFICATES = {
|
CERTIFICATES = {
|
||||||
'ecdsa_secp256r1_sha256': Certificate(DATA_FILES_PATH + '/test-ca2.crt',
|
'ecdsa_secp256r1_sha256': Certificate('$DATA_FILES_PATH/test-ca2.crt',
|
||||||
DATA_FILES_PATH + '/ecdsa_secp256r1.crt',
|
'$DATA_FILES_PATH/ecdsa_secp256r1.crt',
|
||||||
DATA_FILES_PATH + '/ecdsa_secp256r1.key'),
|
'$DATA_FILES_PATH/ecdsa_secp256r1.key'),
|
||||||
'ecdsa_secp384r1_sha384': Certificate(DATA_FILES_PATH + '/test-ca2.crt',
|
'ecdsa_secp384r1_sha384': Certificate('$DATA_FILES_PATH/test-ca2.crt',
|
||||||
DATA_FILES_PATH + '/ecdsa_secp384r1.crt',
|
'$DATA_FILES_PATH/ecdsa_secp384r1.crt',
|
||||||
DATA_FILES_PATH + '/ecdsa_secp384r1.key'),
|
'$DATA_FILES_PATH/ecdsa_secp384r1.key'),
|
||||||
'ecdsa_secp521r1_sha512': Certificate(DATA_FILES_PATH + '/test-ca2.crt',
|
'ecdsa_secp521r1_sha512': Certificate('$DATA_FILES_PATH/test-ca2.crt',
|
||||||
DATA_FILES_PATH + '/ecdsa_secp521r1.crt',
|
'$DATA_FILES_PATH/ecdsa_secp521r1.crt',
|
||||||
DATA_FILES_PATH + '/ecdsa_secp521r1.key'),
|
'$DATA_FILES_PATH/ecdsa_secp521r1.key'),
|
||||||
'rsa_pss_rsae_sha256': Certificate(DATA_FILES_PATH + '/test-ca_cat12.crt',
|
'rsa_pss_rsae_sha256': Certificate('$DATA_FILES_PATH/test-ca_cat12.crt',
|
||||||
DATA_FILES_PATH + '/server2-sha256.crt',
|
'$DATA_FILES_PATH/server2-sha256.crt',
|
||||||
DATA_FILES_PATH + '/server2.key')
|
'$DATA_FILES_PATH/server2.key')
|
||||||
}
|
}
|
||||||
|
|
||||||
CIPHER_SUITE_IANA_VALUE = {
|
CIPHER_SUITE_IANA_VALUE = {
|
||||||
@ -550,6 +549,9 @@ SSL_OUTPUT_HEADER = '''#!/bin/sh
|
|||||||
# AND REGENERATE THIS FILE.
|
# AND REGENERATE THIS FILE.
|
||||||
#
|
#
|
||||||
'''
|
'''
|
||||||
|
DATA_FILES_PATH_VAR = '''
|
||||||
|
DATA_FILES_PATH=../framework/data_files
|
||||||
|
'''
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
"""
|
"""
|
||||||
@ -629,6 +631,7 @@ def main():
|
|||||||
with open(args.output, 'w', encoding="utf-8") as f:
|
with open(args.output, 'w', encoding="utf-8") as f:
|
||||||
f.write(SSL_OUTPUT_HEADER.format(
|
f.write(SSL_OUTPUT_HEADER.format(
|
||||||
filename=os.path.basename(args.output), cmd=' '.join(sys.argv)))
|
filename=os.path.basename(args.output), cmd=' '.join(sys.argv)))
|
||||||
|
f.write(DATA_FILES_PATH_VAR)
|
||||||
f.write('\n\n'.join(get_all_test_cases()))
|
f.write('\n\n'.join(get_all_test_cases()))
|
||||||
f.write('\n')
|
f.write('\n')
|
||||||
else:
|
else:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user