Unverified Commit 154bc4a7 authored by Jack Rickard's avatar Jack Rickard
Browse files

Merge branch 'master' into crl_bindings

parents 3f68c0e5 4adb25c0

.github/workflows/ci.yml

+5 −2
Original line number Diff line number Diff line
@@ -157,10 +157,13 @@ jobs: 
            - name: openssl

              version: vendored

            - name: openssl

              version: 3.0.5

              version: 3.1.0-beta1

              dl-path: /

            - name: openssl

              version: 1.1.1q

              version: 3.0.8

              dl-path: /

            - name: openssl

              version: 1.1.1t

              dl-path: /

            - name: openssl

              version: 1.1.0l

openssl-macros/src/lib.rs

+2 −0
Original line number Diff line number Diff line 
#![allow(clippy::uninlined_format_args)]



use proc_macro::TokenStream;

use proc_macro2::Ident;

use quote::quote;

openssl-sys/Cargo.toml

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ readme = "README.md" 
categories = ["cryptography", "external-ffi-bindings"]

links = "openssl"

build = "build/main.rs"

edition = "2018"



[features]

vendored = ['openssl-src']

openssl-sys/build/expando.c

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ RUST_CONF_OPENSSL_NO_IDEA 
RUST_CONF_OPENSSL_NO_CAMELLIA

#endif



#ifdef OPENSSL_NO_CAST

RUST_CONF_OPENSSL_NO_CAST

#endif



#ifdef OPENSSL_NO_CMS

RUST_CONF_OPENSSL_NO_CMS

#endif

openssl-sys/build/find_normal.rs

+1 −2
Original line number Diff line number Diff line 
use pkg_config;

use std::ffi::OsString;

use std::path::{Path, PathBuf};

use std::process::{self, Command};
@@ -211,7 +210,7 @@ fn try_pkg_config() { 


    let lib = match pkg_config::Config::new()

        .print_system_libs(false)

        .find("openssl")

        .probe("openssl")

    {

        Ok(lib) => lib,

        Err(e) => {