add test coverage for #25298
Add test coverage for issue #25298, clean up the json file so it uses consistent indentation Signed-off-by: Alicja Kario <hkario@redhat.com> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Hugo Landau <hlandau@devever.net> (Merged from https://github.com/openssl/openssl/pull/25329)
This commit is contained in:
parent
bb221d3607
commit
144b9ebc3e
1 changed files with 33 additions and 17 deletions
|
@ -2,7 +2,8 @@
|
|||
{"server_command": ["@SERVER@", "s_server", "-www",
|
||||
"-key", "tests/serverX509Key.pem",
|
||||
"-cert", "tests/serverX509Cert.pem",
|
||||
"-verify", "1", "-CAfile", "tests/clientX509Cert.pem"],
|
||||
"-verify", "1",
|
||||
"-CAfile", "tests/clientX509Cert.pem"],
|
||||
"comment": "Use ANY certificate just to ensure that server tries to authorise a client",
|
||||
"environment": {"PYTHONPATH" : "."},
|
||||
"server_hostname": "localhost",
|
||||
|
@ -20,6 +21,22 @@
|
|||
"-p", "@PORT@"]}
|
||||
]
|
||||
},
|
||||
{"server_command": ["@SERVER@", "s_server", "-www",
|
||||
"-key", "tests/serverX509Key.pem",
|
||||
"-cert", "tests/serverX509Cert.pem",
|
||||
"-verify", "1", "-CAfile", "tests/clientX509Cert.pem",
|
||||
"-client_sigalgs", "RSA+SHA384:rsa_pss_rsae_sha384:rsa_pss_pss_sha384"],
|
||||
"comment": "set -client_sigalgs because of https://github.com/openssl/openssl/issues/25277",
|
||||
"environment": {"PYTHONPATH" : "."},
|
||||
"server_hostname": "localhost",
|
||||
"server_port": @PORT@,
|
||||
"tests" : [
|
||||
{"name" : "test-certificate-verify-malformed.py",
|
||||
"arguments" : ["-d", "-k", "tests/clientX509Key.pem",
|
||||
"-c", "tests/clientX509Cert.pem",
|
||||
"-p", "@PORT@"]}
|
||||
]
|
||||
},
|
||||
{"server_command": ["@SERVER@", "s_server", "-www",
|
||||
"-key", "tests/serverX509Key.pem",
|
||||
"-cert", "tests/serverX509Cert.pem"],
|
||||
|
@ -34,5 +51,4 @@
|
|||
"-d"]}
|
||||
]
|
||||
}
|
||||
|
||||
]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue