Unverified Commit 2bd3f7df authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1574 from sfackler/clippy 

Allow LibreSSL 3.4.x
parents 869cf7a2 189c0267

.github/workflows/ci.yml

+5 −1
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ env: 
  RUSTFLAGS: -Dwarnings

  RUST_BACKTRACE: 1



concurrency:

  group: ${{ github.ref }}

  cancel-in-progress: true



jobs:

  rustfmt:

    name: rustfmt
@@ -169,7 +173,7 @@ jobs: 
            - target: x86_64-unknown-linux-gnu

              library:

                name: libressl

                version: 3.4.1

                version: 3.4.2

      name: ${{ matrix.target }}-${{ matrix.library.name }}-${{ matrix.library.version }}

      runs-on: ubuntu-latest

      env:

openssl-sys/build/main.rs

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ See rust-openssl README for more information: 
            (3, 3, 1) => ('3', '3', '1'),

            (3, 3, _) => ('3', '3', 'x'),

            (3, 4, 0) => ('3', '4', '0'),

            (3, 4, 1) => ('3', '4', '1'),

            (3, 4, _) => ('3', '4', 'x'),

            _ => version_error(),

        };

openssl/src/pkey.rs

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
//! let pub_key: Vec<u8> = pkey.public_key_to_pem().unwrap();

//! println!("{:?}", str::from_utf8(pub_key.as_slice()).unwrap());

//! ```

#![allow(clippy::missing_safety_doc)]

use crate::bio::{MemBio, MemBioSlice};

#[cfg(ossl110)]

use crate::cipher::CipherRef;