diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-09-28 09:12:38 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-09-28 09:12:38 +0200 |
| commit | df735da124c10ace126f49ab0153c905d0819a30 (patch) | |
| tree | d30777f61025b4bfdfc9d1e26d6ee6e46859e4f3 /lib/ssl/test/Makefile | |
| parent | 6878e54486be7880b3c885b1903ed2093238a6b5 (diff) | |
| parent | cbb7313a14f83b3947c9d2067f5ebcabc0c0b3a0 (diff) | |
| download | otp-df735da124c10ace126f49ab0153c905d0819a30.tar.gz otp-df735da124c10ace126f49ab0153c905d0819a30.tar.bz2 otp-df735da124c10ace126f49ab0153c905d0819a30.zip | |
Merge remote branch 'upstream/dev' into major
* upstream/dev:
Both the SSLv3 and TLS 1.0/TLS 1.1 specifications require implementations to ignore data following the ClientHello (i.e., extensions) if they do not understand them.
fix unknown ssl extension parsing by changing length from bits to bytes
Temporary disable tests on MAC due to issus with the MAC ODBC drivers
Diffstat (limited to 'lib/ssl/test/Makefile')
| -rw-r--r-- | lib/ssl/test/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/test/Makefile b/lib/ssl/test/Makefile index 45a401aa68..38bc529445 100644 --- a/lib/ssl/test/Makefile +++ b/lib/ssl/test/Makefile @@ -35,8 +35,9 @@ VSN=$(GS_VSN) # ---------------------------------------------------- MODULES = \ - ssl_test_lib \ + ssl_test_lib \ ssl_basic_SUITE \ + ssl_handshake_SUITE \ ssl_packet_SUITE \ ssl_payload_SUITE \ ssl_to_openssl_SUITE \ @@ -46,7 +47,7 @@ MODULES = \ old_ssl_active_SUITE \ old_ssl_active_once_SUITE \ old_ssl_passive_SUITE \ - old_ssl_verify_SUITE \ + old_ssl_verify_SUITE \ old_ssl_peer_cert_SUITE \ old_ssl_misc_SUITE \ old_ssl_protocol_SUITE \ |