Commit b86f547d authored by Charlie Li's avatar Charlie Li
Browse files

Update the OCSP_cert_to_id() signature for LibreSSL 2.8.1 

While here, restore CI for LibreSSL 2.8.0 alongside 2.8.1 to account for the function signature change.
parent e6da0fa4

.circleci/config.yml

+8 −0
Original line number Diff line number Diff line
@@ -107,6 +107,9 @@ libressl_250: &LIBRESSL_250 
  LIBRARY: libressl

  VERSION: 2.5.0

libressl_270: &LIBRESSL_280

  LIBRARY: libressl

  VERSION: 2.8.0

libressl_281: &LIBRESSL_281

  LIBRARY: libressl

  VERSION: 2.8.1
@@ -197,6 +200,10 @@ jobs: 
    <<: *JOB

    environment:

      <<: [*LIBRESSL_280, *X86_64, *BASE]

  x86_64-libressl-2.8.1:

    <<: *JOB

    environment:

      <<: [*LIBRESSL_281, *X86_64, *BASE]

  macos:

    <<: *MACOS_JOB

    environment:
@@ -225,5 +232,6 @@ workflows: 
    - armhf-openssl-1.0.2

    - x86_64-libressl-2.5.0

    - x86_64-libressl-2.8.0

    - x86_64-libressl-2.8.1

    - macos

    - macos-vendored

openssl-sys/build/cfgs.rs

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<& 
        if libressl_version >= 0x2_08_00_00_0 {

            cfgs.push("libressl280");

        }

        if libressl_version >= 0x2_08_01_00_0 {

            cfgs.push("libressl281");

        }

    } else {

        let openssl_version = openssl_version.unwrap();

openssl-sys/src/ocsp.rs

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ pub const V_OCSP_CERTSTATUS_UNKNOWN: c_int = 2; 
pub enum OCSP_BASICRESP {}



cfg_if! {

    if #[cfg(ossl110)] {

    if #[cfg(any(ossl110, libressl281))] {

        extern "C" {

            pub fn OCSP_cert_to_id(

                dgst: *const EVP_MD,