Commit d3144530 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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

it and avoid it, even if this cripples the CCC command
parent 9cb69f77

configure.ac

+3 −0
Original line number Diff line number Diff line
@@ -1023,6 +1023,9 @@ if test X"$OPT_SSL" != Xno; then 
        OPENSSL_ENABLED=1

        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

        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

lib/ssluse.c

+2 −0
Original line number Diff line number Diff line
@@ -801,6 +801,7 @@ int Curl_ossl_shutdown(struct connectdata *conn, int sockindex) 
    } /* while()-loop for the select() */



    if(data->set.verbose) {

#ifdef HAVE_SSL_GET_SHUTDOWN

      switch(SSL_get_shutdown(connssl->handle)) {

      case SSL_SENT_SHUTDOWN:

        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");

        break;

      }

#endif

    }



    connssl->use = FALSE; /* get back to ordinary socket usage */