diff options
| author | digit@chromium.org <digit@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2013-01-24 10:15:07 +0000 |
|---|---|---|
| committer | digit@chromium.org <digit@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2013-01-24 10:15:07 +0000 |
| commit | e4dea707fa21299f1e0abf4c12827adfccb2eb85 (patch) | |
| tree | a28ac4a84eb9469037bd7728b96c7c84b99697cd /openssl/ssl/ssl_lib.c | |
| parent | ecd56d84116e2acded8a6c4e0ea6ffdde09c2a78 (diff) | |
| download | openssl-e4dea707fa21299f1e0abf4c12827adfccb2eb85.tar.gz | |
Update the openssl sources to the latest Android version.
Compared to the previous version, this includes the following fixes:
- Remove "small_records.patch".
https://android-review.googlesource.com/#/c/49977/
- Add support for TLS channel ID.
https://android-review.googlesource.com/#/c/49984/
- Remove recursive lock in X509_PUBKEY_get.
https://android-review.googlesource.com/#/c/50413/
- Add x86_64 assembly files and use them.
https://android-review.googlesource.com/#/c/47913/
https://android-review.googlesource.com/#/c/50401/
https://android-review.googlesource.com/#/c/50402/
This should only matter for the "linux_redux" build, and
the net/tools/flip_server binary (flip_in_mem_edsm_server)
which implements a host SPDY proxy.
- Remove obsolete patch file fix-clang-build.patch.
Review URL: https://codereview.chromium.org/12033053
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@178558 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'openssl/ssl/ssl_lib.c')
| -rw-r--r-- | openssl/ssl/ssl_lib.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/openssl/ssl/ssl_lib.c b/openssl/ssl/ssl_lib.c index d6b8ca8..4db0fef 100644 --- a/openssl/ssl/ssl_lib.c +++ b/openssl/ssl/ssl_lib.c @@ -160,9 +160,6 @@ #include <openssl/engine.h> #endif -/* defined in ssl_ciph.c - not exported by any header. */ -extern const char* SSL_CIPHER_authentication_method(const SSL_CIPHER* cipher); - const char *SSL_version_str=OPENSSL_VERSION_TEXT; SSL3_ENC_METHOD ssl3_undef_enc_method={ @@ -582,6 +579,8 @@ void SSL_free(SSL *s) sk_OCSP_RESPID_pop_free(s->tlsext_ocsp_ids, OCSP_RESPID_free); if (s->tlsext_ocsp_resp) OPENSSL_free(s->tlsext_ocsp_resp); + if (s->tlsext_channel_id_private) + EVP_PKEY_free(s->tlsext_channel_id_private); #endif if (s->client_CA != NULL) @@ -2004,6 +2003,11 @@ void SSL_CTX_free(SSL_CTX *a) ssl_buf_freelist_free(a->rbuf_freelist); #endif +#ifndef OPENSSL_NO_TLSEXT + if (a->tlsext_channel_id_private) + EVP_PKEY_free(a->tlsext_channel_id_private); +#endif + OPENSSL_free(a); } |