generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

openssl: remove unused arguments

Browse Source 
... that popped up when SSL_IS_PROXY() was modified.
This commit is contained in:
Daniel Stenberg 2015-07-01 00:19:45 +02:00
parent 211b265ffd
commit 7df237b0b1
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/vtls/openssl.c
View File

@ -1092,8 +1092,7 @@ static int asn1_output(const ASN1_UTCTIME *tm,
in the certificate and must exactly match the IP in the URI. in the certificate and must exactly match the IP in the URI.
*/ */
static CURLcode verifyhost(struct connectdata *conn, static CURLcode verifyhost(struct connectdata *conn, X509 *server_cert)
X509 *server_cert, const int sockindex)
{ {
int matched = -1; /* -1 is no alternative match yet, 1 means match and 0 int matched = -1; /* -1 is no alternative match yet, 1 means match and 0
means mismatch */ means mismatch */
@ -2653,8 +2652,7 @@ static CURLcode pkp_pin_peer_pubkey(X509* cert, const char *pinnedpubkey)
*/ */
static CURLcode servercert(struct connectdata *conn, static CURLcode servercert(struct connectdata *conn,
struct ssl_connect_data *connssl, struct ssl_connect_data *connssl,
bool strict, bool strict)
const int sockindex)
{ {
CURLcode result = CURLE_OK; CURLcode result = CURLE_OK;
int rc; int rc;
@ -2694,7 +2692,7 @@ static CURLcode servercert(struct connectdata *conn,
infof(data, "\t expire date: %s\n", buffer); infof(data, "\t expire date: %s\n", buffer);
if(SSL_CONN_CONFIG(verifyhost)) { if(SSL_CONN_CONFIG(verifyhost)) {
result = verifyhost(conn, connssl->server_cert, sockindex); result = verifyhost(conn, connssl->server_cert);
if(result) { if(result) {
X509_free(connssl->server_cert); X509_free(connssl->server_cert);
connssl->server_cert = NULL; connssl->server_cert = NULL;
@ -2855,9 +2853,8 @@ static CURLcode ossl_connect_step3(struct connectdata *conn, int sockindex)
* operations. * operations.
*/ */
result = servercert(conn, connssl, result = servercert(conn, connssl, (SSL_CONN_CONFIG(verifypeer) ||
(SSL_CONN_CONFIG(verifypeer) || SSL_CONN_CONFIG(verifyhost)));
SSL_CONN_CONFIG(verifyhost)), sockindex);
if(!result) if(!result)
connssl->connecting_state = ssl_connect_done; connssl->connecting_state = ssl_connect_done;