Merge branch 'curl:master' into master

.cirrus.yml

@@ -29,9 +29,9 @@ freebsd_task:
     - name: FreeBSD 13.0
       freebsd_instance:
         image_family: freebsd-13-0
-    - name: FreeBSD 12.2
+    - name: FreeBSD 12.3
       freebsd_instance:
-        image_family: freebsd-12-2
+        image_family: freebsd-12-3
 
   env:
     CIRRUS_CLONE_DEPTH: 10
@@ -40,11 +40,11 @@ freebsd_task:
 
   pkginstall_script:
     - pkg update -f
-    - pkg install -y autoconf automake libtool pkgconf brotli openldap24-client heimdal libpsl libssh2 openssh-portable libidn2 librtmp libnghttp2 nghttp2 stunnel
+    - pkg install -y autoconf automake libtool pkgconf brotli openldap24-client heimdal libpsl libssh2 openssh-portable libidn2 librtmp libnghttp2 nghttp2 stunnel py38-pip
     - pkg delete -y curl
-    - easy_install "cryptography<3.2"
-    - easy_install "pyOpenSSL<20.0"
-    - easy_install "impacket"
+    - pip install "cryptography<3.2"
+    - pip install "pyOpenSSL<20.0"
+    - pip install "impacket"
   configure_script:
     - autoreconf -fi
     # Building with the address sanitizer is causing unexplainable test issues due to timeouts

.github/workflows/mbedtls.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
     - run: |
-        sudo apt-get install libtool autoconf automake pkg-config clang stunnel4
+        sudo apt-get install libtool autoconf automake pkg-config clang stunnel4 libpsl-dev libbrotli-dev libzstd-dev libnghttp2-dev
         sudo python3 -m pip install impacket
       name: install prereqs and impacket
 

.github/workflows/msh3.yml

@@ -0,0 +1,57 @@
+name: Linux
+
+on:
+  # Trigger the workflow on push or pull requests, but only for the
+  # master branch
+  push:
+    branches:
+    - master
+    - '*/ci'
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  autotools:
+    name: ${{ matrix.build.name }}
+    runs-on: 'ubuntu-latest'
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        build:
+        - name: msh3
+          install:
+          configure: --with-msh3=$HOME/msh3 --enable-debug --enable-werror --with-openssl=$HOME/quictls
+
+    steps:
+    - run: |
+        sudo apt-get install libtool autoconf automake pkg-config clang stunnel4 libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev
+        sudo python3 -m pip install impacket
+      name: install prereqs and impacket
+
+    - run: |
+        git clone --depth 1 -b OpenSSL_1_1_1j+quic https://github.com/quictls/openssl ossl
+        cd ossl
+        ./config enable-tls1_3 --prefix=$HOME/quictls
+        make
+        make install_sw
+      name: 'build and install quictls'
+
+    - run: |
+        git clone --depth 1 --recursive https://github.com/nibanks/msh3
+        cd msh3 && mkdir build && cd build
+        cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=$HOME/msh3 ..
+        cmake --build .
+        cmake --install .
+      name: 'build and install msh3'
+
+    - uses: actions/checkout@v2
+
+    - run: autoreconf -fi && LDFLAGS="-Wl,-rpath,$HOME/msh3/lib -Wl,-rpath,$HOME/quictls/lib" ./configure --enable-warnings --enable-werror --enable-headers-api ${{ matrix.build.configure }} && make V=1
+      name: 'configure and build curl'
+
+    - run: make V=1 test-ci
+      name: 'test'
+      env:
+        TFLAGS: "${{ matrix.build.tflags }}"

.mailmap

@@ -84,7 +84,7 @@ Abhinav Singh <[email protected]>
 Malik Idrees Hasan Khan <[email protected]>
 Yongkang Huang <[email protected]>
 Xiaoke Wang <[email protected]>
-pheiduck on github <[email protected]>
+Philip H <[email protected]>
 neutric on github <[email protected]>
 Jan-Piet Mens <[email protected]>
 Henrik Holst <[email protected]>

Makefile.am

@@ -282,9 +282,9 @@ ca-bundle: scripts/mk-ca-bundle.pl
 	@echo "generating a fresh ca-bundle.crt"
 	@perl $< -b -l -u lib/ca-bundle.crt
 
-ca-firefox: lib/firefox-db2pem.sh
+ca-firefox: scripts/firefox-db2pem.sh
 	@echo "generating a fresh ca-bundle.crt"
-	./lib/firefox-db2pem.sh lib/ca-bundle.crt
+	$< lib/ca-bundle.crt
 
 checksrc:
 	(cd lib && $(MAKE) checksrc)