travis: upgrade the MesaLink TLS backend to v1.0.0

Closes #3823
Closes #3776

diff --git a/.travis.yml b/.travis.yml
index 9a27d925eb98eb0122b1a9275b99de9326ebfa85..1fed71a2ee49dc37a806c06b8d814fc1436c90eb 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ sudo: required
 cache:
     directories:
         - $HOME/wolfssl-4.0.0-stable
+        - $HOME/mesalink-1.0.0
         - $HOME/nghttp2-1.34.0
 
 env:
@@ -113,6 +114,12 @@ matrix:
                   packages:
                       - *common_packages
                       - libpsl-dev
+        - os: linux
+          compiler: gcc
+          dist: trusty
+          env:
+              - T=debug-mesalink C="--with-mesalink --without-ssl"
+              - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
         - os: linux
           compiler: clang
           dist: xenial
@@ -406,6 +413,20 @@ before_script:
           make)
         fi
       fi
+    - |
+      if [ $TRAVIS_OS_NAME = linux ]; then
+        if [ ! -e $HOME/mesalink-1.0.0/Makefile ]; then
+          (cd $HOME && \
+          curl https://sh.rustup.rs -sSf | sh -s -- -y && \
+          source $HOME/.cargo/env && \
+          curl -LO https://github.com/mesalock-linux/mesalink/archive/v1.0.0.tar.gz && \
+          tar -xzf v1.0.0.tar.gz && \
+          cd mesalink-1.0.0 && \
+          ./autogen.sh && \
+          ./configure --enable-tls13  && \
+          make)
+        fi
+      fi
     - |
       if [ $TRAVIS_OS_NAME = linux ]; then
         if [ ! -e $HOME/nghttp2-1.34.0/Makefile ]; then
@@ -420,6 +441,7 @@ before_script:
     - |
       if [ $TRAVIS_OS_NAME = linux ]; then
         (cd $HOME/wolfssl-4.0.0-stable && sudo make install)
+        (cd $HOME/mesalink-1.0.0 && sudo make install)
         (cd $HOME/nghttp2-1.34.0 && sudo make install)
       fi
 
@@ -452,6 +474,13 @@ script:
              make
              make "TFLAGS=-n !313" test-nonflaky
         fi
+    - |
+        set -eo pipefail
+        if [ "$T" = "debug-mesalink" ]; then
+             ./configure --enable-debug --enable-werror $C
+             make
+             make "TFLAGS=-n !313" test-nonflaky
+        fi
     - |
         set -eo pipefail
         if [ "$T" = "novalgrind" ]; then

diff --git a/lib/vtls/mesalink.c b/lib/vtls/mesalink.c
index db14115593328e0aabe9bae68b88c7acd95ca239..718c282ee56cb621f02eafa45d1fd95fe0fbcdb8 100644 (file)
--- a/lib/vtls/mesalink.c
+++ b/lib/vtls/mesalink.c
@@ -268,7 +268,7 @@ mesalink_connect_step2(struct connectdata *conn, int sockindex)
     char error_buffer[MESALINK_MAX_ERROR_SZ];
     int detail = SSL_get_error(BACKEND->handle, ret);
 
-    if(SSL_ERROR_WANT_CONNECT == detail) {
+    if(SSL_ERROR_WANT_CONNECT == detail || SSL_ERROR_WANT_READ == detail) {
       connssl->connecting_state = ssl_connect_2_reading;
       return CURLE_OK;
     }