eden-emu/mbedtls
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix wrong typo and indent issue

Browse source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2023-10-18 15:06:54 +08:00
parent ca3790d653
commit 2f3f968033
2 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/mbedtls_dev/generate_server9_bad_saltlen.py
View file

@ -67,7 +67,7 @@ def main():
return generate(**vars(args)) return generate(**vars(args))
def generate(**kwargs): def generate(**kwargs):
"""Generate different slt length certificate file.""" """Generate different salt length certificate file."""
ca_password = kwargs.get('ca_password', '') ca_password = kwargs.get('ca_password', '')
if ca_password: if ca_password:
kwargs['ca_password'] = r'-passin "pass:{ca_password}"'.format( kwargs['ca_password'] = r'-passin "pass:{ca_password}"'.format(

25
tests/data_files/Makefile
View file

@ -203,10 +203,8 @@ test-ca2.ku-%.crt: test-ca2.ku-%.crt.openssl.v3_ext $(test_ca_key_file_ec) test-
$(OPENSSL) x509 -req -in test-ca2.req.sha256 -extfile $< \ $(OPENSSL) x509 -req -in test-ca2.req.sha256 -extfile $< \
-signkey $(test_ca_key_file_ec) -days 3653 -out $@ -signkey $(test_ca_key_file_ec) -days 3653 -out $@
all_final += test-ca2.ku-crl.crt \ all_final += test-ca2.ku-crl.crt test-ca2.ku-crt.crt test-ca2.ku-crt_crl.crt \
test-ca2.ku-crt.crt \ test-ca2.ku-ds.crt
test-ca2.ku-crt_crl.crt \
test-ca2.ku-ds.crt
test-ca2-future.crt: $(test_ca_key_file_ec) test-ca2.req.sha256 test-ca2-future.crt: $(test_ca_key_file_ec) test-ca2.req.sha256
$(MBEDTLS_CERT_WRITE) is_ca=1 serial=13926223505202072808 request_file=test-ca2.req.sha256 selfsign=1 \ $(MBEDTLS_CERT_WRITE) is_ca=1 serial=13926223505202072808 request_file=test-ca2.req.sha256 selfsign=1 \
@ -586,10 +584,9 @@ server9-bad-mgfhash.crt: server9.csr $(test_ca_crt) $(test_ca_key_file_rsa)
-in $< -out $@ -in $< -out $@
all_final += server9-bad-mgfhash.crt all_final += server9-bad-mgfhash.crt
server9-bad-saltlen.crt: server9.csr \ server9-bad-saltlen.crt: server9.csr $(test_ca_crt) $(test_ca_key_file_rsa) \
$(test_ca_crt) $(test_ca_key_file_rsa) \ opensslcnf/server9.crt.v3_ext \
opensslcnf/server9.crt.v3_ext \ ../../scripts/mbedtls_dev/generate_server9_bad_saltlen.py
../../scripts/mbedtls_dev/generate_server9_bad_saltlen.py
../../scripts/mbedtls_dev/generate_server9_bad_saltlen.py --ca-name test-ca \ ../../scripts/mbedtls_dev/generate_server9_bad_saltlen.py --ca-name test-ca \
--ca-password $(test_ca_pwd_rsa) --csr server9.csr \ --ca-password $(test_ca_pwd_rsa) --csr server9.csr \
--openssl-extfile opensslcnf/server9.crt.v3_ext \ --openssl-extfile opensslcnf/server9.crt.v3_ext \
@ -1549,9 +1546,9 @@ server6-ss-child.csr : server6.key
all_intermediate += server6-ss-child.csr all_intermediate += server6-ss-child.csr
server6-ss-child.crt: server6-ss-child.csr server5-selfsigned.crt server5.key server6-ss-child.crt.openssl.v3_ext server6-ss-child.crt: server6-ss-child.csr server5-selfsigned.crt server5.key server6-ss-child.crt.openssl.v3_ext
$(OPENSSL) x509 -req -CA server5-selfsigned.crt -CAkey server5.key \ $(OPENSSL) x509 -req -CA server5-selfsigned.crt -CAkey server5.key \
-extfile server6-ss-child.crt.openssl.v3_ext \ -extfile server6-ss-child.crt.openssl.v3_ext \
-set_serial 0x53a2cb5822399474a7ec79ec \ -set_serial 0x53a2cb5822399474a7ec79ec \
-days 3650 -sha256 -in $< -out $@ -days 3650 -sha256 -in $< -out $@
all_final += server6-ss-child.crt all_final += server6-ss-child.crt
@ -1718,9 +1715,9 @@ crl.pem: $(test_ca_crt) $(test_ca_key_file_rsa) $(test_ca_config_file)
$(OPENSSL) ca -gencrl -batch -cert $(test_ca_crt) -keyfile $(test_ca_key_file_rsa) -key $(test_ca_pwd_rsa) -config $(test_ca_server1_config_file) -md sha1 -crldays 3653 -out $@ $(OPENSSL) ca -gencrl -batch -cert $(test_ca_crt) -keyfile $(test_ca_key_file_rsa) -key $(test_ca_pwd_rsa) -config $(test_ca_server1_config_file) -md sha1 -crldays 3653 -out $@
crl-futureRevocationDate.pem: $(test_ca_crt) $(test_ca_key_file_rsa) \ crl-futureRevocationDate.pem: $(test_ca_crt) $(test_ca_key_file_rsa) \
$(test_ca_config_file) \ $(test_ca_config_file) \
test-ca.server1.future-crl.db \ test-ca.server1.future-crl.db \
test-ca.server1.future-crl.opensslconf test-ca.server1.future-crl.opensslconf
$(FAKETIME) -f '+10y' $(OPENSSL) ca -gencrl \ $(FAKETIME) -f '+10y' $(OPENSSL) ca -gencrl \
-config test-ca.server1.future-crl.opensslconf -crldays 365 \ -config test-ca.server1.future-crl.opensslconf -crldays 365 \
-passin "pass:$(test_ca_pwd_rsa)" -out $@ -passin "pass:$(test_ca_pwd_rsa)" -out $@