Merge pull request #1150 from schu/fix-netops-ssl

netops: on SSL teardown only send shutdown alert
This commit is contained in:
Vicent Martí 2012-12-19 13:43:50 -08:00
commit 5c3c86b06e

View File

@ -198,10 +198,7 @@ static int gitno_ssl_teardown(gitno_ssl *ssl)
{
int ret;
do {
ret = SSL_shutdown(ssl->ssl);
} while (ret == 0);
ret = SSL_shutdown(ssl->ssl);
if (ret < 0)
ret = ssl_set_error(ssl, ret);
else
@ -409,10 +406,10 @@ static int ssl_setup(gitno_socket *socket, const char *host, int flags)
if ((ret = SSL_connect(socket->ssl.ssl)) <= 0)
return ssl_set_error(&socket->ssl, ret);
if ((GITNO_CONNECT_SSL_NO_CHECK_CERT & flags) || verify_server_cert(&socket->ssl, host) < 0)
return -1;
if (GITNO_CONNECT_SSL_NO_CHECK_CERT & flags)
return 0;
return 0;
return verify_server_cert(&socket->ssl, host);
}
#endif