Release/111

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: cargo
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "08:00"
+  open-pull-requests-limit: 10

.github/workflows/main.yml

@@ -1,148 +1,125 @@
 name: CI
-on: [push, pull_request]
+on:
+  push:
+    branches: [master, release/111]
+  pull_request:
+    branches: [master, release/111]
+
+defaults:
+  run:
+    shell: bash
 
 jobs:
   test:
     name: Test
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        thing:
-        - stable
-        - beta
-        - nightly
-        - macos-x86_64
-        - arm-android
-        - arm64-android
-        - i686-android
-        - x86_64-android
-        - i686-linux
-        - arm-linux
-        - aarch64-linux
-        - x86_64-musl
-        - x86_64-mingw
-        - asmjs
-        - i686-msvc
-        - i686-msvc-static
-        - x86_64-msvc
-        - x86_64-msvc-static
         include:
-        - thing: stable
-          target: x86_64-unknown-linux-gnu
+        - target: x86_64-unknown-linux-gnu
           rust: stable
           os: ubuntu-latest
-        - thing: beta
-          target: x86_64-unknown-linux-gnu
+        - target: x86_64-unknown-linux-gnu
           rust: beta
           os: ubuntu-latest
-        - thing: nightly
-          target: x86_64-unknown-linux-gnu
+        - target: x86_64-unknown-linux-gnu
           rust: nightly
           os: ubuntu-latest
-        - thing: macos-x86_64
-          target: x86_64-apple-darwin
+        - target: x86_64-apple-darwin
           rust: stable
           os: macos-latest
-        - thing: arm-android
-          target: arm-linux-androideabi
-          rust: stable
-          os: ubuntu-latest
-        - thing: arm64-android
-          target: aarch64-linux-android
-          rust: stable
-          os: ubuntu-latest
-        - thing: i686-android
-          target: i686-linux-android
+        - target: aarch64-apple-darwin
+          rust: nightly
+          os: macos-latest
+        #- target: arm-linux-androideabi
+        #  rust: stable
+        #  os: ubuntu-latest
+        - target: aarch64-linux-android
           rust: stable
           os: ubuntu-latest
-        - thing: x86_64-android
-          target: x86_64-linux-android
+        - target: i686-linux-android
           rust: stable
           os: ubuntu-latest
-        - thing: i686-linux
-          target: i686-unknown-linux-gnu
+        - target: x86_64-linux-android
           rust: stable
           os: ubuntu-latest
-        - thing: arm-linux
-          target: arm-unknown-linux-gnueabi
+        - target: i686-unknown-linux-gnu
           rust: stable
           os: ubuntu-latest
-        - thing: aarch64-linux
-          target: aarch64-unknown-linux-gnu
+        - target: arm-unknown-linux-gnueabi
           rust: stable
           os: ubuntu-latest
-        - thing: x86_64-musl
-          target: x86_64-unknown-linux-musl
+        - target: aarch64-unknown-linux-gnu
           rust: stable
           os: ubuntu-latest
-        - thing: x86_64-mingw
-          target: x86_64-pc-windows-gnu
+        - target: x86_64-unknown-linux-musl
           rust: stable
           os: ubuntu-latest
-        - thing: asmjs
-          target: asmjs-unknown-emscripten
+        - target: x86_64-pc-windows-gnu
           rust: stable
           os: ubuntu-latest
-        - thing: i686-msvc
-          target: i686-pc-windows-msvc
+        # - target: asmjs-unknown-emscripten
+        #   rust: stable
+        #   os: ubuntu-latest
+        - target: i686-pc-windows-msvc
           rust: stable-i686-msvc
-          os: windows-2016
-        - thing: i686-msvc-static
-          target: i686-pc-windows-msvc
+          os: windows-2019
+        - target: i686-pc-windows-msvc
           rust: stable-i686-msvc
-          os: windows-2016
-          crt_static: true
-        - thing: x86_64-msvc
-          target: x86_64-pc-windows-msvc
+          os: windows-2019
+          crt_static: yes
+        - target: x86_64-pc-windows-msvc
           rust: stable-x86_64-msvc
           os: windows-latest
-        - thing: x86_64-msvc-static
-          target: x86_64-pc-windows-msvc
+        - target: x86_64-pc-windows-msvc
           rust: stable-x86_64-msvc
           os: windows-latest
-          crt_static: true
+          crt_static: yes
+        - target: x86_64-pc-windows-msvc
+          rust: stable-x86_64-msvc
+          os: windows-latest
+          nasm_exe: installed
 
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v1
       with:
         submodules: true
     - name: Install Rust (rustup)
       run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
-      if: matrix.os != 'macos-latest'
-      shell: bash
-    - name: Install Rust (macos)
-      run: |
-        curl https://sh.rustup.rs | sh -s -- -y
-        echo ::add-path::$HOME/.cargo/bin
-      if: matrix.os == 'macos-latest'
     - run: rustup target add ${{ matrix.target }}
     - name: Set crt-static
       if: matrix.crt_static == 'yes'
-      run: echo ::set-env name=RUSTFLAGS::-Ctarget-feature=+crt-static
-      shell: bash
+      run: echo RUSTFLAGS=-Ctarget-feature=+crt-static >> $GITHUB_ENV
     - name: Use strawberry perl
       if: startsWith(matrix.os, 'windows')
-      run: echo ::add-path::C:/Strawberry/perl/bin
-      shell: bash
-    - run: |
+      run: echo OPENSSL_SRC_PERL=C:/Strawberry/perl/bin/perl >> $GITHUB_ENV
+    - name: Run tests (not Windows)
+      if: "!startsWith(matrix.os, 'windows')"
+      run: |
         set -e
         cargo generate-lockfile
         ./ci/run-docker.sh ${{ matrix.target }}
-      if: "!startsWith(matrix.os, 'windows')"
-      name: Run tests (not Windows)
-    - run: |
-        cargo test --manifest-path testcrate/Cargo.toml --target ${{ matrix.target }}
-        cargo test --manifest-path testcrate/Cargo.toml --target ${{ matrix.target }} --release
-        cargo run --release --target ${{ matrix.target }} --manifest-path testcrate/Cargo.toml --features package
+    - name: Download nasm.exe (Windows)
+      if: matrix.nasm_exe == 'installed'
+      run: |
+        WINNASMVERSION='2.15.05'
+        curl -O https://www.nasm.us/pub/nasm/releasebuilds/${WINNASMVERSION}/win64/nasm-${WINNASMVERSION}-win64.zip
+        unzip nasm-${WINNASMVERSION}-win64.zip
+        echo "$GITHUB_WORKSPACE\\nasm-${WINNASMVERSION}" >> $GITHUB_PATH
+        echo "OPENSSL_RUST_USE_NASM=1" >> $GITHUB_ENV
+    - name: Run tests (Windows)
       if: startsWith(matrix.os, 'windows')
-      name: Run tests (Windows)
-      shell: cmd
+      run: |
+        cargo test --manifest-path testcrate/Cargo.toml --target ${{ matrix.target }} -vv
+        cargo test --manifest-path testcrate/Cargo.toml --target ${{ matrix.target }} --release -vv
+        cargo run --release --target ${{ matrix.target }} --manifest-path testcrate/Cargo.toml --features package -vv
 
   rustfmt:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v1
     - name: Install Rust
       run: rustup update stable && rustup default stable && rustup component add rustfmt
     - run: cargo fmt -- --check

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "openssl-src"
-version = "111.6.0+1.1.1d"
+version = "111.22.0+1.1.1q"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -14,10 +14,27 @@ exclude = [
   'openssl/krb5/*',
   'openssl/pyca-cryptography/*',
   'openssl/test/*',
+  'openssl/wycheproof/*',
 ]
 
+[features]
+default = []
+# Enables compilation of some older algorithms: md2 (hash), rc5 (block cypher) and enabled use of
+# some weaker algorithms in SSL connections. These are generally not recommended for use.
+weak-crypto = []
+# Enables compilation of the Camellia symmetric key block cypher. Since hardware acceleration for
+# it is not available on most systems, this is not as used as AES.
+camellia = []
+# Enables compilation of International Data Encryption Algorithm (IDEA), a symmetric key block
+# cypher sometimes used as an AES128 alternative.
+idea = []
+# Enables compilation of SEED, a symmetric key block cypher mostly used in South Korea, but
+# otherwise not widely supported.
+seed = []
+
 [workspace]
 members = ['testcrate']
+exclude = ['target']
 
 [dependencies]
 cc = "1.0"

README.md

@@ -15,8 +15,24 @@ This project is licensed under either of
 
 at your option.
 
+### Windows MSVC Assembly
+Building OpenSSL for `windows-msvc` targets, users can choose whether to enable
+assembly language routines, which requires [nasm](https://www.nasm.us/).  
+The build process will automatically detect whether `nasm.exe` is installed in
+PATH. If found, the assembly language routines will be enabled (in other words,
+the `no-asm` option will NOT be configured).  
+You can manipulate this behavior by setting the `OPENSSL_RUST_USE_NASM` environment
+variable:
+* `1`: Force enable the assembly language routines. (panic if `nasm.exe` is not
+availible.)
+* `0`: Force disable the assembly language routines even if the `nasm.exe` can be
+found in PATH.
+* not set: Let the build process automatically detect whether `nasm.exe` is
+installed. If found, enable. If not, disable.
+However, this environment variable does not take effects on non-windows platforms.
+
 ### Contribution
 
 Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in Serde by you, as defined in the Apache-2.0 license, shall be
+for inclusion in openssl-src by you, as defined in the Apache-2.0 license, shall be
 dual licensed as above, without any additional terms or conditions.

ci/docker/aarch64-linux-android/Dockerfile

@@ -20,4 +20,4 @@ RUN android-ndk-r15b/build/tools/make_standalone_toolchain.py \
 
 ENV PATH=$PATH:/android/ndk/bin \
   CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android-gcc \
-  CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER=true
+  CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER=echo

ci/docker/aarch64-unknown-linux-gnu/Dockerfile

@@ -8,5 +8,5 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
   libc6-dev \
   gcc-aarch64-linux-gnu \
   libc6-dev-arm64-cross
-ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER=true \
+ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER=echo \
   CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc

ci/docker/arm-linux-androideabi/Dockerfile

@@ -20,4 +20,4 @@ RUN android-ndk-r15b/build/tools/make_standalone_toolchain.py \
 
 ENV PATH=$PATH:/android/ndk/bin \
   CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
-  CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER=true
+  CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER=echo

ci/docker/arm-unknown-linux-gnueabi/Dockerfile

@@ -9,5 +9,5 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
   gcc-arm-linux-gnueabi \
   libc6-dev-armel-cross
 
-ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_RUNNER=true \
+ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_RUNNER=echo \
   CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc

ci/docker/i686-linux-android/Dockerfile

@@ -20,4 +20,4 @@ RUN android-ndk-r15b/build/tools/make_standalone_toolchain.py \
 
 ENV PATH=$PATH:/android/ndk/bin \
   CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-gcc \
-  CARGO_TARGET_I686_LINUX_ANDROID_RUNNER=true
+  CARGO_TARGET_I686_LINUX_ANDROID_RUNNER=echo

ci/docker/x86_64-linux-android/Dockerfile

@@ -20,4 +20,4 @@ RUN android-ndk-r15b/build/tools/make_standalone_toolchain.py \
 
 ENV PATH=$PATH:/android/ndk/bin \
   CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android-gcc \
-  CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER=true
+  CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER=echo

ci/docker/x86_64-pc-windows-gnu/Dockerfile

@@ -9,4 +9,4 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
   gcc-mingw-w64-x86-64
 
 ENV CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=x86_64-w64-mingw32-gcc \
-  CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUNNER=true
+  CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUNNER=echo

ci/run.sh

@@ -1,4 +1,39 @@
+#!/bin/bash
+
 target=$1
+testcrate_dir="$(pwd)/testcrate"
 set -ex
-cargo test --manifest-path testcrate/Cargo.toml --target $1 -vv
-cargo test --manifest-path testcrate/Cargo.toml --target $1 -vv --release
+
+if [ "$1" = "aarch64-apple-darwin" ] ; then
+  export CARGO_TARGET_AARCH64_APPLE_DARWIN_RUNNER=echo
+fi
+
+cargo test --manifest-path "$testcrate_dir/Cargo.toml" --target $1 -vv
+cargo test --manifest-path "$testcrate_dir/Cargo.toml" --target $1 -vv --release
+
+if [ "$1" = "x86_64-unknown-linux-gnu" ] ; then
+  cargo test --manifest-path "$testcrate_dir/Cargo.toml" --target $1 -vv --all-features
+
+  # Run a few tests here:
+  #
+  # * Make sure the packaged crate file isn't bigger than 10MB which is
+  #   crate.io's limit.
+  # * Make sure that the package crate itself works.
+  #
+  # A lot of OpenSSL's source code is excluded on crates.io because it makes the
+  # crate file much too large, so the test here should inform us if we're
+  # missing anything actually required to build OpenSSL.
+  rm -rf target/ci
+  cargo package --allow-dirty --target-dir target/ci
+  crate=`ls target/ci/package/*.crate`
+  filesize=$(stat -c%s "$crate")
+  echo "tarball is $filesize bytes"
+  if (( filesize > 10000000 )); then
+    echo "file size too big"
+    exit 1
+  fi
+  rm "$crate"
+  cd target/ci/package/openssl-src-*
+  cp -r "$testcrate_dir" .
+  cargo test --manifest-path "testcrate/Cargo.toml" --target $1 -vv
+fi