Commit 2a29aac8 authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge remote-tracking branch 'origin/master' into openssl-300

parents d081c2b5 94e70e09

.circleci/config.yml

+2 −8
Original line number Diff line number Diff line
@@ -226,12 +226,6 @@ openssl_101: &openssl_101 
workflows:

  test:

    jobs:

      - linux:

          name: mimimal-version

          target: x86_64-unknown-linux-musl

          vendored: true

          image: 1.31.0

          minimal_build: true

      - linux:

          name: musl-vendored

          target: x86_64-unknown-linux-musl
@@ -298,10 +292,10 @@ workflows: 
          library: libressl

          version: 2.5.5

      - linux:

          name: x86_64-libressl-3.1.0

          name: x86_64-libressl-3.2.0

          target: x86_64-unknown-linux-gnu

          library: libressl

          version: 3.1.0

          version: 3.2.0

      - macos:

          name: macos

      - macos:

.github/workflows/ci.yml

0 → 100644
+134 −0
Original line number Diff line number Diff line 
name: CI



on:

  pull_request:

    branches:

      - master

  push:

    branches:

      - master



env:

  RUSTFLAGS: -Dwarnings

  RUST_BACKTRACE: 1



jobs:

  rustfmt:

    name: rustfmt

    runs-on: ubuntu-latest

    steps:

      - uses: actions/checkout@v2

      - name: Install Rust

        run: rustup update stable && rustup default stable

      - name: Check formatting

        run: cargo fmt --all -- --check



  clippy:

    name: clippy

    runs-on: ubuntu-latest

    steps:

      - uses: actions/checkout@v2

      - name: Install Rust

        run: rustup update stable && rustup default stable

      - name: Get rust version

        id: rust-version

        run: echo "::set-output name=version::$(rustc --version)"

      - name: Cache cargo index

        uses: actions/cache@v1

        with:

          path: ~/.cargo/registry/index

          key: index-${{ runner.os }}-${{ github.run_number }}

          restore-keys: |

            index-${{ runner.os }}-

      - name: Create lockfile

        run: cargo generate-lockfile

      - name: Cache cargo registry

        uses: actions/cache@v1

        with:

          path: ~/.cargo/registry/cache

          key: registry-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}

      - name: Fetch dependencies

        run: cargo fetch

      - name: Cache target directory

        uses: actions/cache@v1

        with:

          path: target

          key: clippy-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}

      - name: Run clippy

        run: cargo clippy --all --all-targets



  min-version:

    name: min-version

    runs-on: ubuntu-latest

    steps:

      - uses: actions/checkout@v2

      - name: Install Rust

        run: rustup update 1.31.0 && rustup default 1.31.0

      - name: Get rust version

        id: rust-version

        run: echo "::set-output name=version::$(rustc --version)"

      - name: Cache cargo index

        uses: actions/cache@v1

        with:

          path: ~/.cargo/registry/index

          key: index-${{ runner.os }}-${{ github.run_number }}

          restore-keys: |

            index-${{ runner.os }}-

      - name: Create lockfile

        run: cargo generate-lockfile

      - name: Cache cargo registry

        uses: actions/cache@v1

        with:

          path: ~/.cargo/registry/cache

          key: registry-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}

      - name: Fetch dependencies

        run: cargo fetch

      - name: Cache target directory

        uses: actions/cache@v1

        with:

          path: target

          key: min-version-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}

      - name: Check openssl

        run: cargo check -p openssl



  windows-vcpkg:

    name: windows-vcpkg

    runs-on: windows-latest

    env:

      VCPKGRS_DYNAMIC: 1

    steps:

      - uses: actions/checkout@v2

      - name: Install Rust

        run: rustup update stable && rustup default stable

      - name: Get rust version

        id: rust-version

        run: echo "::set-output name=version::$(rustc --version)"

      - name: Set vcpkg root

        run: echo "::set-env name=VCPKG_ROOT::$Env:VCPKG_INSTALLATION_ROOT"

      - name: Install OpenSSL

        run: vcpkg install openssl:x64-windows

      - name: Cache cargo index

        uses: actions/cache@v1

        with:

          path: ~/.cargo/registry/index

          key: index-${{ runner.os }}-${{ github.run_number }}

          restore-keys: |

            index-${{ runner.os }}-

      - name: Create lockfile

        run: cargo generate-lockfile

      - name: Cache cargo registry

        uses: actions/cache@v1

        with:

          path: ~/.cargo/registry/cache

          key: registry-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}

      - name: Fetch dependencies

        run: cargo fetch

      - name: Cache target directory

        uses: actions/cache@v1

        with:

          path: target

          key: min-version-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}

      - name: Run systest

        run: cargo run -p systest

      - name: Test openssl

        run: cargo test -p openssl

README.md

+0 −1
Original line number Diff line number Diff line 
# rust-openssl



[![CircleCI](https://circleci.com/gh/sfackler/rust-openssl.svg?style=shield)](https://circleci.com/gh/sfackler/rust-openssl)

[![Build status](https://ci.appveyor.com/api/projects/status/d1knobws948pyynk/branch/master?svg=true)](https://ci.appveyor.com/project/sfackler/rust-openssl/branch/master)

[![crates.io](https://img.shields.io/crates/v/openssl.svg)](https://crates.io/crates/openssl)



OpenSSL bindings for the Rust programming language.

appveyor.yml

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
environment:

  SSL_CERT_FILE: "C:\\OpenSSL\\cacert.pem"

  matrix:

    # 1.1.1, 64 bit

    - TARGET: x86_64-pc-windows-msvc

      BITS: 64

      OPENSSL_VERSION: 1_1_1g

      OPENSSL_DIR: C:\OpenSSL



    # 1.0.2, 32 bit

    - TARGET: i686-pc-windows-msvc

      BITS: 32

      OPENSSL_VERSION: 1_0_2u

      OPENSSL_DIR: C:\OpenSSL



    # vcpkg

    - TARGET: x86_64-pc-windows-msvc

      VCPKG_DEFAULT_TRIPLET: x64-windows

      VCPKGRS_DYNAMIC: 1

install:

  # install OpenSSL

  - mkdir C:\OpenSSL

  - ps: if (Test-Path env:OPENSSL_VERSION) { Start-FileDownload "http://slproweb.com/download/Win${env:BITS}OpenSSL-${env:OPENSSL_VERSION}.exe" }

  - if defined OPENSSL_VERSION Win%BITS%OpenSSL-%OPENSSL_VERSION%.exe /SILENT /VERYSILENT /SP- /DIR="C:\OpenSSL"

  - appveyor DownloadFile https://curl.haxx.se/ca/cacert.pem -FileName C:\OpenSSL\cacert.pem



  # Install Rust

  - curl -sSf -o rustup-init.exe https://win.rustup.rs/

  - rustup-init.exe -y --default-host %TARGET%

  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin

  - if defined MSYS2 set PATH=C:\msys64\mingw%BITS%\bin;%PATH%

  - rustc -V

  - cargo -V

  - if defined VCPKG_DEFAULT_TRIPLET git clone https://github.com/Microsoft/vcpkg c:\projects\vcpkg

  - if defined VCPKG_DEFAULT_TRIPLET c:\projects\vcpkg\bootstrap-vcpkg.bat

  - if defined VCPKG_DEFAULT_TRIPLET set VCPKG_ROOT=c:\projects\vcpkg

  - if defined VCPKG_DEFAULT_TRIPLET echo yes > %VCPKG_ROOT%\Downloads\AlwaysAllowDownloads

  - if defined VCPKG_DEFAULT_TRIPLET %VCPKG_ROOT%\vcpkg.exe install openssl



build: false



test_script:

  - cargo run --manifest-path systest/Cargo.toml --target %TARGET%

  - cargo test --manifest-path openssl/Cargo.toml --target %TARGET%

openssl-sys/CHANGELOG.md

+32 −1
Original line number Diff line number Diff line
@@ -2,6 +2,34 @@ 


## [Unreleased]



## [v0.9.58] - 2020-06-05



### Added



* Added `SSL_set_mtu`.

* Added support for LibreSSL 3.2.0.

* Added `PEM_read_bio_EC_PUBKEY`, `PEM_write_bio_EC_PUBKEY`, `d2i_EC_PUBKEY`, and `i2d_EC_PUBKEY`.

* Added `EVP_PKEY_encrypt_init`, `EVP_PKEY_encrypt`, `EVP_PKEY_decrypt_init`, `EVP_PKEY_decrypt`,

    `EVP_PKEY_get_raw_public_key`, `EVP_PKEY_new_raw_public_key`, `EVP_PKEY_get_raw_private_key`,

    and `EVP_PKEY_new_raw_private_key`.

* Added `OBJ_sn2nid`.



## [v0.9.57] - 2020-05-24



### Added



* Added support for LibreSSL 3.1.x.



## [v0.9.56] - 2020-05-07



### Fixed



* Fixed vendored builds on windows-gnu targets.



### Added



* Added support for LibreSSL 3.0.0.



## [v0.9.55] - 2020-04-07



### Fixed
@@ -117,7 +145,10 @@ 
* Added `X509_verify` and `X509_REQ_verify`.

* Added `EVP_MD_type` and `EVP_GROUP_get_curve_name`.



[Unreleased]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.55...master

[Unreleased]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.58...master

[v0.9.58]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.57...openssl-sys-v0.9.58

[v0.9.57]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.56...openssl-sys-v0.9.57

[v0.9.56]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.55...openssl-sys-v0.9.56

[v0.9.55]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.54...openssl-sys-v0.9.55

[v0.9.54]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.53...openssl-sys-v0.9.54

[v0.9.53]: https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.52...openssl-sys-v0.9.53