PORTREVISION=	1

--- lib/vtls/wolfssl.c.orig	2019-10-15 21:41:50 UTC

+++ lib/vtls/wolfssl.c

@@ -105,11 +105,11 @@ static Curl_send wolfssl_send;

 static int do_file_type(const char *type)

 {

   if(!type || !type[0])

-    return SSL_FILETYPE_PEM;

+    return WOLFSSL_FILETYPE_PEM;

   if(strcasecompare(type, "PEM"))

-    return SSL_FILETYPE_PEM;

+    return WOLFSSL_FILETYPE_PEM;

   if(strcasecompare(type, "DER"))

-    return SSL_FILETYPE_ASN1;

+    return WOLFSSL_FILETYPE_ASN1;

   return -1;

 }

@@ -306,8 +306,8 @@ wolfssl_connect_step1(struct connectdata *conn,

    * anyway. In the latter case the result of the verification is checked with

    * SSL_get_verify_result() below. */

   SSL_CTX_set_verify(BACKEND->ctx,

-                     SSL_CONN_CONFIG(verifypeer)?SSL_VERIFY_PEER:

-                                                 SSL_VERIFY_NONE,

+                     SSL_CONN_CONFIG(verifypeer)?WOLFSSL_VERIFY_PEER:

+                                                 WOLFSSL_VERIFY_NONE,

                      NULL);

 #ifdef HAVE_SNI

@@ -380,7 +380,7 @@ wolfssl_connect_step1(struct connectdata *conn,

     if(wolfSSL_UseALPN(BACKEND->handle, protocols,

                        (unsigned)strlen(protocols),

-                       WOLFSSL_ALPN_CONTINUE_ON_MISMATCH) != SSL_SUCCESS) {

+                       WOLFSSL_ALPN_CONTINUE_ON_MISMATCH) != WOLFSSL_SUCCESS) {

       failf(data, "SSL: failed setting ALPN protocols");

       return CURLE_SSL_CONNECT_ERROR;

     }

@@ -440,7 +440,7 @@ wolfssl_connect_step2(struct connectdata *conn,

   /* Enable RFC2818 checks */

   if(SSL_CONN_CONFIG(verifyhost)) {

     ret = wolfSSL_check_domain_name(BACKEND->handle, hostname);

-    if(ret == SSL_FAILURE)

+    if(ret == WOLFSSL_FAILURE)

       return CURLE_OUT_OF_MEMORY;

   }

@@ -449,11 +449,11 @@ wolfssl_connect_step2(struct connectdata *conn,

     char error_buffer[WOLFSSL_MAX_ERROR_SZ];

     int  detail = SSL_get_error(BACKEND->handle, ret);

-    if(SSL_ERROR_WANT_READ == detail) {

+    if(WOLFSSL_ERROR_WANT_READ == detail) {

       connssl->connecting_state = ssl_connect_2_reading;

       return CURLE_OK;

     }

-    else if(SSL_ERROR_WANT_WRITE == detail) {

+    else if(WOLFSSL_ERROR_WANT_WRITE == detail) {

       connssl->connecting_state = ssl_connect_2_writing;

       return CURLE_OK;

     }

@@ -560,7 +560,7 @@ wolfssl_connect_step2(struct connectdata *conn,

     rc = wolfSSL_ALPN_GetProtocol(BACKEND->handle, &protocol, &protocol_len);

-    if(rc == SSL_SUCCESS) {

+    if(rc == WOLFSSL_SUCCESS) {

       infof(data, "ALPN, server accepted to use %.*s\n", protocol_len,

             protocol);

@@ -663,8 +663,8 @@ static ssize_t wolfssl_send(struct connectdata *conn,

     int err = SSL_get_error(BACKEND->handle, rc);

     switch(err) {

-    case SSL_ERROR_WANT_READ:

-    case SSL_ERROR_WANT_WRITE:

+    case WOLFSSL_ERROR_WANT_READ:

+    case WOLFSSL_ERROR_WANT_WRITE:

       /* there's data pending, re-invoke SSL_write() */

       *curlcode = CURLE_AGAIN;

       return -1;

@@ -709,10 +709,10 @@ static ssize_t wolfssl_recv(struct connectdata *conn,

     int err = SSL_get_error(BACKEND->handle, nread);

     switch(err) {

-    case SSL_ERROR_ZERO_RETURN: /* no more data */

+    case WOLFSSL_ERROR_ZERO_RETURN: /* no more data */

       break;

-    case SSL_ERROR_WANT_READ:

-    case SSL_ERROR_WANT_WRITE:

+    case WOLFSSL_ERROR_WANT_READ:

+    case WOLFSSL_ERROR_WANT_WRITE:

       /* there's data pending, re-invoke SSL_read() */

       *curlcode = CURLE_AGAIN;

       return -1;

@@ -747,7 +747,7 @@ static size_t Curl_wolfssl_version(char *buffer, size_

 static int Curl_wolfssl_init(void)

 {

-  return (wolfSSL_Init() == SSL_SUCCESS);

+  return (wolfSSL_Init() == WOLFSSL_SUCCESS);

 }

@@ -936,18 +936,18 @@ static CURLcode Curl_wolfssl_random(struct Curl_easy *

   return CURLE_OK;

 }

-static CURLcode Curl_wolfssl_sha256sum(const unsigned char *tmp, /* input */

-                                  size_t tmplen,

-                                  unsigned char *sha256sum /* output */,

-                                  size_t unused)

-{

-  Sha256 SHA256pw;

-  (void)unused;

-  wc_InitSha256(&SHA256pw);

-  wc_Sha256Update(&SHA256pw, tmp, (word32)tmplen);

-  wc_Sha256Final(&SHA256pw, sha256sum);

-  return CURLE_OK;

-}

+//static CURLcode Curl_wolfssl_sha256sum(const unsigned char *tmp, /* input */

+//                                  size_t tmplen,

+//                                  unsigned char *sha256sum /* output */,

+//                                  size_t unused)

+//{

+//  Sha256 SHA256pw;

+//  (void)unused;

+//  wc_InitSha256(&SHA256pw);

+//  wc_Sha256Update(&SHA256pw, tmp, (word32)tmplen);

+//  wc_Sha256Final(&SHA256pw, sha256sum);

+//  return CURLE_OK;

+//}

 static void *Curl_wolfssl_get_internals(struct ssl_connect_data *connssl,

                                        CURLINFO info UNUSED_PARAM)

@@ -985,7 +985,7 @@ const struct Curl_ssl Curl_ssl_wolfssl = {

   Curl_none_engines_list,          /* engines_list */

   Curl_none_false_start,           /* false_start */

   Curl_none_md5sum,                /* md5sum */

-  Curl_wolfssl_sha256sum            /* sha256sum */

+//  Curl_wolfssl_sha256sum            /* sha256sum */

 };

 #endif