| commit | ad81ab8861773c23407d00ce8edd02fe630dfd96 | [log] [tgz] |
|---|---|---|
| author | mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Sat Sep 28 07:24:39 2013 |
| committer | mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Sat Sep 28 07:24:39 2013 |
| tree | 0ded92e009cf9f67727970a3baaacdf756411dc5 | |
| parent | 30377c7f7121dc698a905ddcc079a624e385befc [diff] |
Suppress SSL error strings on mac_asan to unbreak that build Example borkedness: http://chromegw/i/client.webrtc/builders/Mac%20Asan/builds/642/steps/libjingl... Original CL for this issue is here https://webrtc-codereview.appspot.com/2263004/ and this got reverted in here https://code.google.com/p/webrtc/source/diff?spec=svn4874&r=4872&format=side&path=/trunk/talk/base/openssladapter.cc&old_path=/trunk/talk/base/openssladapter.cc&old=4798 Trying to land it again now. TBR=fischman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2318005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4875 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/base/openssladapter.cc b/talk/base/openssladapter.cc index 50391e5..8e33a03 100644 --- a/talk/base/openssladapter.cc +++ b/talk/base/openssladapter.cc
@@ -233,7 +233,10 @@ bool OpenSSLAdapter::InitializeSSL(VerificationCallback callback) { if (!InitializeSSLThread() || !SSL_library_init()) return false; +#if !defined(ADDRESS_SANITIZER) || !defined(OSX) + // Loading the error strings crashed mac_asan. Omit this debugging aid there. SSL_load_error_strings(); +#endif ERR_load_BIO_strings(); OpenSSL_add_all_algorithms(); RAND_poll();