fix various issues

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2022-01-27 13:01:01 +08:00
parent adb1869f8d
commit 81d5e1feca
2 changed files with 3 additions and 21 deletions

View File

@ -21,17 +21,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
#if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC)
#undef MBEDTLS_SSL_ENCRYPT_THEN_MAC #undef MBEDTLS_SSL_ENCRYPT_THEN_MAC
#endif
#if defined(MBEDTLS_SSL_EXTENDED_MASTER_SECRET)
#undef MBEDTLS_SSL_EXTENDED_MASTER_SECRET #undef MBEDTLS_SSL_EXTENDED_MASTER_SECRET
#endif
#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
#undef MBEDTLS_SSL_PROTO_TLS1_2 #undef MBEDTLS_SSL_PROTO_TLS1_2
#endif
#if !defined(MBEDTLS_SSL_PROTO_TLS1_3) #if !defined(MBEDTLS_SSL_PROTO_TLS1_3)
#define MBEDTLS_SSL_PROTO_TLS1_3 #define MBEDTLS_SSL_PROTO_TLS1_3
@ -41,18 +34,7 @@
#define MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE #define MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE
#endif #endif
#if defined(MBEDTLS_SSL_PROTO_DTLS)
#undef MBEDTLS_SSL_PROTO_DTLS #undef MBEDTLS_SSL_PROTO_DTLS
#endif
#if defined(MBEDTLS_SSL_DTLS_ANTI_REPLAY)
#undef MBEDTLS_SSL_DTLS_ANTI_REPLAY #undef MBEDTLS_SSL_DTLS_ANTI_REPLAY
#endif
#if defined(MBEDTLS_SSL_DTLS_HELLO_VERIFY)
#undef MBEDTLS_SSL_DTLS_HELLO_VERIFY #undef MBEDTLS_SSL_DTLS_HELLO_VERIFY
#endif
#if defined(MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE)
#undef MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE #undef MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE
#endif

View File

@ -2705,8 +2705,8 @@ component_build_armcc () {
armc6_build_test "--target=aarch64-arm-none-eabi -march=armv8.2-a" armc6_build_test "--target=aarch64-arm-none-eabi -march=armv8.2-a"
} }
component_test_tls13_only_build () { component_test_tls13_only () {
msg "build: default config with MBEDTLS_SSL_PROTO_TLS1_3 only, without MBEDTLS_SSL_PROTO_TLS1_2" msg "build: default config with MBEDTLS_SSL_PROTO_TLS1_3, without MBEDTLS_SSL_PROTO_TLS1_2"
make CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"../tests/configs/tls13-only.h\"'" make CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"../tests/configs/tls13-only.h\"'"
msg "ssl-opt.sh (TLS 1.3)" msg "ssl-opt.sh (TLS 1.3)"