Unverified Commit 7c18edef authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1510 from sfackler/sfackler-patch-1 

Bump to 3.0.0-beta2 in CI
parents a99fb686 8a3afe6d

.github/workflows/ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ jobs: 
            - name: openssl

              version: vendored

            - name: openssl

              version: 3.0.0-beta1

              version: 3.0.0-beta2

              dl-path: /

            - name: openssl

              version: 1.1.1k
@@ -203,7 +203,7 @@ jobs: 
        - uses: actions/cache@v2

          with:

            path: /opt/openssl

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

            key: openssl-${{ matrix.target }}-${{ matrix.library.name }}-${{ matrix.library.version }}-2

          if: matrix.library.version != 'vendored'

          id: openssl-cache

        - name: Build OpenSSL
@@ -241,7 +241,7 @@ jobs: 


            case "${{ matrix.library.name }}" in

            "openssl")

              ./Configure --prefix=$OPENSSL_DIR $OS_COMPILER -fPIC -g $OS_FLAGS no-shared

              ./Configure --prefix=$OPENSSL_DIR --libdir=lib $OS_COMPILER -fPIC -g $OS_FLAGS no-shared

              ;;

            "libressl")

              ./configure --prefix=$OPENSSL_DIR --disable-shared --with-pic

openssl-sys/build/find_normal.rs

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ pub fn get_openssl(target: &str) -> (PathBuf, PathBuf) { 
    match (lib_dir, include_dir) {

        (Some(lib_dir), Some(include_dir)) => (lib_dir, include_dir),

        (lib_dir, include_dir) => {

            let openssl_dir = env("OPENSSL_DIR").unwrap_or_else(|| find_openssl_dir(&target));

            let openssl_dir = env("OPENSSL_DIR").unwrap_or_else(|| find_openssl_dir(target));

            let openssl_dir = Path::new(&openssl_dir);

            let lib_dir = lib_dir.unwrap_or_else(|| openssl_dir.join("lib"));

            let include_dir = include_dir.unwrap_or_else(|| openssl_dir.join("include"));

openssl-sys/build/main.rs

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ fn main() { 


    let libs_env = env("OPENSSL_LIBS");

    let libs = match libs_env.as_ref().and_then(|s| s.to_str()) {

        Some(ref v) => {

        Some(v) => {

            if v.is_empty() {

                vec![]

            } else {

openssl-sys/src/evp.rs

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ extern "C" { 
        data: *const c_void,

        count: size_t,

        md: *mut c_uchar,

        size: *mut c_uint,

        size: *mut size_t,

    ) -> c_int;

    pub fn EVP_DigestInit(ctx: *mut EVP_MD_CTX, typ: *const EVP_MD) -> c_int;

    pub fn EVP_DigestFinal(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32) -> c_int;

openssl/examples/mk_certs.rs

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ fn mk_ca_cert() -> Result<(X509, PKey<Private>), ErrorStack> { 
/// Make a X509 request with the given private key

fn mk_request(key_pair: &PKey<Private>) -> Result<X509Req, ErrorStack> {

    let mut req_builder = X509ReqBuilder::new()?;

    req_builder.set_pubkey(&key_pair)?;

    req_builder.set_pubkey(key_pair)?;



    let mut x509_name = X509NameBuilder::new()?;

    x509_name.append_entry_by_text("C", "US")?;
@@ -73,7 +73,7 @@ fn mk_request(key_pair: &PKey<Private>) -> Result<X509Req, ErrorStack> { 
    let x509_name = x509_name.build();

    req_builder.set_subject_name(&x509_name)?;



    req_builder.sign(&key_pair, MessageDigest::sha256())?;

    req_builder.sign(key_pair, MessageDigest::sha256())?;

    let req = req_builder.build();

    Ok(req)

}
@@ -131,7 +131,7 @@ fn mk_ca_signed_cert( 
        .build(&cert_builder.x509v3_context(Some(ca_cert), None))?;

    cert_builder.append_extension(subject_alt_name)?;



    cert_builder.sign(&ca_key_pair, MessageDigest::sha256())?;

    cert_builder.sign(ca_key_pair, MessageDigest::sha256())?;

    let cert = cert_builder.build();



    Ok((cert, key_pair))