yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-02-02 06:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove merge conflict marker in ssl-opt.sh

Browse source 
Commit 6346a75dfb introduced a merge conflict marker into ssl-opt.sh
by accident. This commit removes it.
This commit is contained in:
Simon Butcher 2018-10-25 21:51:32 +01:00
parent 169712e15a
commit 76cf60beb3
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/ssl-opt.sh
View file

@ -5242,7 +5242,6 @@ run_test "EC restart: TLS, max_ops=1000, ECDHE-PSK" \
-C "mbedtls_pk_verify.*4b00" \ -C "mbedtls_pk_verify.*4b00" \
-C "mbedtls_ecdh_make_public.*4b00" \ -C "mbedtls_ecdh_make_public.*4b00" \
-C "mbedtls_pk_sign.*4b00" -C "mbedtls_pk_sign.*4b00"
=======
# Tests of asynchronous private key support in SSL # Tests of asynchronous private key support in SSL