diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-01-20 01:00:51 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-02-15 08:27:35 +0100 |
| commit | a08db496429e09561c8b8d243e79b21ef04f98f2 (patch) | |
| tree | 5d30b30ae0cdf82a69e8257965f9e8db2020653b | |
| parent | 04aa9645b5b425b48c47d673732e32028faf76ce (diff) | |
| download | gnurl-a08db496429e09561c8b8d243e79b21ef04f98f2.tar.gz gnurl-a08db496429e09561c8b8d243e79b21ef04f98f2.tar.bz2 gnurl-a08db496429e09561c8b8d243e79b21ef04f98f2.zip | |
axtls: adapt to API changes
Builds with axTLS 2.1.2. This then also breaks compatibility with axTLS
< 2.1.0 (the older API)
... and fix the session_id mixup brought in 04b4ee549
Fixes #1220
| -rw-r--r-- | docs/INTERNALS.md | 2 | ||||
| -rw-r--r-- | lib/vtls/axtls.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docs/INTERNALS.md b/docs/INTERNALS.md index 61ab80a47..a733e1f0c 100644 --- a/docs/INTERNALS.md +++ b/docs/INTERNALS.md @@ -88,7 +88,7 @@ Dependencies - MIT Kerberos 1.2.4 - GSKit V5R3M0 - NSS 3.14.x - - axTLS 1.2.7 + - axTLS 2.1.0 - PolarSSL 1.3.0 - Heimdal ? - nghttp2 1.0.0 diff --git a/lib/vtls/axtls.c b/lib/vtls/axtls.c index b1b4d32a5..1de758b0c 100644 --- a/lib/vtls/axtls.c +++ b/lib/vtls/axtls.c @@ -6,7 +6,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2010, DirecTV, Contact: Eric Hu, <ehu@directv.com>. - * Copyright (C) 2010 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2010 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -267,13 +267,13 @@ static CURLcode connect_prep(struct connectdata *conn, int sockindex) /* we got a session id, use it! */ infof(data, "SSL re-using session ID\n"); ssl = ssl_client_new(ssl_ctx, conn->sock[sockindex], - ssl_sessionid, (uint8_t)ssl_idsize); + ssl_sessionid, (uint8_t)ssl_idsize, NULL); } Curl_ssl_sessionid_unlock(conn); } if(!ssl) - ssl = ssl_client_new(ssl_ctx, conn->sock[sockindex], NULL, 0); + ssl = ssl_client_new(ssl_ctx, conn->sock[sockindex], NULL, 0, NULL); conn->ssl[sockindex].ssl = ssl; return CURLE_OK; @@ -387,8 +387,8 @@ static CURLcode connect_finish(struct connectdata *conn, int sockindex) /* Put our freshly minted SSL session in cache */ if(data->set.general_ssl.sessionid) { - const uint8_t *ssl_sessionid = ssl_get_session_id_size(ssl); - size_t ssl_idsize = ssl_get_session_id(ssl); + const uint8_t *ssl_sessionid = ssl_get_session_id(ssl); + size_t ssl_idsize = ssl_get_session_id_size(ssl); Curl_ssl_sessionid_lock(conn); if(Curl_ssl_addsessionid(conn, (void *) ssl_sessionid, ssl_idsize, sockindex) != CURLE_OK) |