commit | 7c0d06c221ce9edf44bbf978b909b38a0aee2084 | [log] [tgz] |
---|---|---|
author | David Benjamin <davidben@google.com> | Thu Aug 11 13:26:41 2016 -0400 |
committer | David Benjamin <davidben@google.com> | Fri Sep 23 14:04:09 2016 -0400 |
tree | 493174506e099dc14252674dc832d9f11e58c4dc | |
parent | 7b550be7e74118580614c6aa5c414d7245d2f189 [diff] [blame] |
external/boringssl: Sync to e34bcc91. This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/0e9138d295cd556e830dc8b3be735e808680f4bd..e34bcc91c07c0bf65ecc53a814d51f5246007150 This also removes BORINGSSL_ENABLE_RC4_TLS and android_compat_hacks.c as they are no longer needed. Test: Built tree, phone boots. Ran cts-tradefed run cts -m CtsLibcoreTestCases Change-Id: I86df196e1856c338bbf72c60e2e47dd1b74ae537
diff --git a/src/tool/server.cc b/src/tool/server.cc index e0aeb13..012f671 100644 --- a/src/tool/server.cc +++ b/src/tool/server.cc
@@ -133,7 +133,9 @@ args_map["-max-version"].c_str()); return false; } - SSL_CTX_set_max_version(ctx, version); + if (!SSL_CTX_set_max_proto_version(ctx, version)) { + return false; + } } if (args_map.count("-min-version") != 0) { @@ -143,7 +145,9 @@ args_map["-min-version"].c_str()); return false; } - SSL_CTX_set_min_version(ctx, version); + if (!SSL_CTX_set_min_proto_version(ctx, version)) { + return false; + } } if (args_map.count("-ocsp-response") != 0 &&