diff options
| author | jnd@chromium.org <jnd@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2012-01-25 01:50:40 +0000 |
|---|---|---|
| committer | jnd@chromium.org <jnd@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2012-01-25 01:50:40 +0000 |
| commit | 480da75abf485e7e2a6be5acc0f71842368792c0 (patch) | |
| tree | 4ccbebefd1a3ab6fb0ab91cca34b0459ce145f17 /openssl/ssl/t1_clnt.c | |
| parent | 864570723968450a32e842d39f46acfd9a5bb5e5 (diff) | |
| download | openssl-480da75abf485e7e2a6be5acc0f71842368792c0.tar.gz | |
Upgrade chrome's OpenSSL to same version Android ships with.
This change is basically from openssl.org with the patches applied as per patches/README in https://android.googlesource.com/platform/external/openssl, plus 3 patches for Chromium to pass compliation and tests. Please refer to b/5428019 for more details.
BUG=None
TEST=net_unittests
Review URL: https://chromiumcodereview.appspot.com/9254031
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@118977 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'openssl/ssl/t1_clnt.c')
| -rw-r--r-- | openssl/ssl/t1_clnt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl/ssl/t1_clnt.c b/openssl/ssl/t1_clnt.c index 4d1e198..c87af17 100644 --- a/openssl/ssl/t1_clnt.c +++ b/openssl/ssl/t1_clnt.c @@ -63,8 +63,8 @@ #include <openssl/objects.h> #include <openssl/evp.h> -static SSL_METHOD *tls1_get_client_method(int ver); -static SSL_METHOD *tls1_get_client_method(int ver) +static const SSL_METHOD *tls1_get_client_method(int ver); +static const SSL_METHOD *tls1_get_client_method(int ver) { if (ver == TLS1_VERSION) return(TLSv1_client_method()); |