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

yassl doesn't have SSL_get_shutdown() in its OpenSSL() layer so we check for

Browse Source 
it and avoid it, even if this cripples the CCC command
This commit is contained in:
Daniel Stenberg
2007-03-14 23:40:46 +00:00
parent 9cb69f77f1
commit d314453037
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -1023,6 +1023,9 @@ if test X"$OPT_SSL" != Xno; then
OPENSSL_ENABLED=1 OPENSSL_ENABLED=1
AC_DEFINE(USE_OPENSSL, 1, [if OpenSSL is in use])) AC_DEFINE(USE_OPENSSL, 1, [if OpenSSL is in use]))
dnl yassl doesn't have SSL_get_shutdown ?
AC_CHECK_FUNCS( SSL_get_shutdown )
if test $ac_cv_header_openssl_x509_h = no; then if test $ac_cv_header_openssl_x509_h = no; then
dnl we don't use the "action" part of the AC_CHECK_HEADERS macro dnl we don't use the "action" part of the AC_CHECK_HEADERS macro
dnl since 'err.h' might in fact find a krb4 header with the same dnl since 'err.h' might in fact find a krb4 header with the same

2
lib/ssluse.c
View File

@@ -801,6 +801,7 @@ int Curl_ossl_shutdown(struct connectdata *conn, int sockindex)
} /* while()-loop for the select() */ } /* while()-loop for the select() */
if(data->set.verbose) { if(data->set.verbose) {
#ifdef HAVE_SSL_GET_SHUTDOWN
switch(SSL_get_shutdown(connssl->handle)) { switch(SSL_get_shutdown(connssl->handle)) {
case SSL_SENT_SHUTDOWN: case SSL_SENT_SHUTDOWN:
infof(data, "SSL_get_shutdown() returned SSL_SENT_SHUTDOWN\n"); infof(data, "SSL_get_shutdown() returned SSL_SENT_SHUTDOWN\n");
@@ -813,6 +814,7 @@ int Curl_ossl_shutdown(struct connectdata *conn, int sockindex)
"SSL_RECEIVED__SHUTDOWN\n"); "SSL_RECEIVED__SHUTDOWN\n");
break; break;
} }
#endif
} }
connssl->use = FALSE; /* get back to ordinary socket usage */ connssl->use = FALSE; /* get back to ordinary socket usage */