Unverified Commit 0e2cd821 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1149 from sfackler/libressl-3 

Support LibreSSL 3.0.0
parents dbe0672d 749f837d

.circleci/config.yml

+6 −2
Original line number Diff line number Diff line
@@ -115,6 +115,10 @@ jobs: 
      - restore_cache:

          key: registry

      - run: cargo generate-lockfile

      - when:

          condition: << parameters.minimal_build >>

          steps:

            - run: cargo update -p pkg-config --precise 0.3.14

      - save_cache:

          key: registry-{{ .BuildNum }}

          paths:
@@ -288,10 +292,10 @@ workflows: 
          library: libressl

          version: 2.5.5

      - linux:

          name: x86_64-libressl-2.9

          name: x86_64-libressl-3.0

          target: x86_64-unknown-linux-gnu

          library: libressl

          version: 2.9.1

          version: 3.0.0

      - macos:

          name: macos

      - macos:

openssl-sys/build/main.rs

+18 −16
Original line number Diff line number Diff line
@@ -183,28 +183,30 @@ See rust-openssl README for more information: 
    if let Some(libressl_version) = libressl_version {

        println!("cargo:libressl_version_number={:x}", libressl_version);



        let major = (libressl_version >> 28) as u8;

        let minor = (libressl_version >> 20) as u8;

        let fix = (libressl_version >> 12) as u8;

        let (minor, fix) = match (minor, fix) {

            (5, 0) => ('5', '0'),

            (5, 1) => ('5', '1'),

            (5, 2) => ('5', '2'),

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

            (6, 0) => ('6', '0'),

            (6, 1) => ('6', '1'),

            (6, 2) => ('6', '2'),

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

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

            (8, 0) => ('8', '0'),

            (8, 1) => ('8', '1'),

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

            (9, 0) => ('9', '0'),

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

        let (major, minor, fix) = match (major, minor, fix) {

            (2, 5, 0) => ('2', '5', '0'),

            (2, 5, 1) => ('2', '5', '1'),

            (2, 5, 2) => ('2', '5', '2'),

            (2, 5, _) => ('2', '5', 'x'),

            (2, 6, 0) => ('2', '6', '0'),

            (2, 6, 1) => ('2', '6', '1'),

            (2, 6, 2) => ('2', '6', '2'),

            (2, 6, _) => ('2', '6', 'x'),

            (2, 7, _) => ('2', '7', 'x'),

            (2, 8, 0) => ('2', '8', '0'),

            (2, 8, 1) => ('2', '8', '1'),

            (2, 8, _) => ('2', '8', 'x'),

            (2, 9, 0) => ('2', '9', '0'),

            (2, 9, _) => ('2', '9', 'x'),

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

            _ => version_error(),

        };



        println!("cargo:libressl=true");

        println!("cargo:libressl_version=2{}{}", minor, fix);

        println!("cargo:libressl_version={}{}{}", major, minor, fix);

        println!("cargo:version=101");

        Version::Libressl

    } else {