[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 135/173: axtls: adapt to API changes
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 135/173: axtls: adapt to API changes |
Date: |
Fri, 24 Feb 2017 14:02:37 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.53.1
in repository gnurl.
commit a08db496429e09561c8b8d243e79b21ef04f98f2
Author: Daniel Stenberg <address@hidden>
AuthorDate: Fri Jan 20 01:00:51 2017 +0100
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
---
docs/INTERNALS.md | 2 +-
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, <address@hidden>.
- * Copyright (C) 2010 - 2016, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 2010 - 2017, Daniel Stenberg, <address@hidden>, 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)
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 105/173: OS400: Fix symbols, (continued)
- [GNUnet-SVN] [gnurl] 105/173: OS400: Fix symbols, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 55/173: IDN: Use TR46 non-transitional, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 97/173: gnutls: disable TLS session tickets, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 48/173: docs: FAQ MAIL-ETIQUETTE language fixes, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 75/173: openssl: Fix random generation, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 74/173: TODO: share OpenSSL contexts, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 99/173: RELEASE-NOTES; synced with ab08d82648, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 79/173: docs: non-blocking SSL handshake is now supported with NSS, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 98/173: mbedtls: disable TLS session tickets, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 132/173: smb: code indent, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 135/173: axtls: adapt to API changes,
gnunet <=
- [GNUnet-SVN] [gnurl] 106/173: docs: Add more HTTPS proxy documentation, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 57/173: docs: Add note about libcurl copying strings to CURLOPT_* manpages, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 119/173: test1139: Added the --manual keyword since the manual is required, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 124/173: nss: make FTPS work with --proxytunnel, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 93/173: INTERNALS.md: language improvements, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 110/173: CHANGES: spell fix, use correct path to script, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 78/173: CURLOPT_CONNECT_TO: Fix compile warnings, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 88/173: vtls: source indentation fix, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 170/173: tests: use consistent environment variables for setting charset, gnunet, 2017/02/24
- [GNUnet-SVN] [gnurl] 153/173: TLS: make SSL_VERIFYSTATUS work again, gnunet, 2017/02/24