Skip to content
This repository has been archived by the owner on Sep 26, 2023. It is now read-only.

Commit

Permalink
Merge pull request #7 from expressvpn/upgrade-wolfssl-5.4
Browse files Browse the repository at this point in the history
Upgrade WolfSSL 5.4
  • Loading branch information
expressvpn-pete-m authored Jul 23, 2022
2 parents 9425a0c + a750339 commit d197e07
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wolfssl-sys"
version = "0.1.4"
version = "0.1.5"
edition = "2021"
authors = ["[email protected]"]
license = "GPL-2.0"
Expand All @@ -11,6 +11,6 @@ keywords = ["wolfssl", "vpn", "expressvpn", "lightway"]
links = "wolfssl"

[build-dependencies]
bindgen = "0.59.2"
bindgen = "0.60.1"
autotools = "0.2"
build-target = "0.4.0"
2 changes: 1 addition & 1 deletion Earthfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION 0.6
FROM rust:1.59
FROM rust:1.62.1

WORKDIR /wolfssl-sys

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ Add `wolfssl-sys` to your Cargo manifest:

```
[dependencies]
wolfssl-sys = "0.1.0"
wolfssl-sys = "0.1.5"
```
To ensure that the crate can be built even offline, the crate includes the source code for WolfSSL (currently version `5.2.0`). WolfSSL uses autotools to build and configure the library so this will need to be install on the build system.
To ensure that the crate can be built even offline, the crate includes the source code for WolfSSL (currently version `5.4.0`). WolfSSL uses autotools to build and configure the library so this will need to be install on the build system.

## Building with Earthly
There is also an `Earthfile` provided so that you can build the crate in [Earthly](https://earthly.dev):
Expand Down
7 changes: 6 additions & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::env;
use std::path::PathBuf;
use std::process::Command;

static WOLFSSL_VERSION: &str = "wolfssl-5.3.0-stable";
static WOLFSSL_VERSION: &str = "wolfssl-5.4.0-stable";

/**
* Work around for bindgen creating duplicate values.
Expand Down Expand Up @@ -95,6 +95,11 @@ fn build_wolfssl(dest: &str) -> PathBuf {
conf.enable("armasm", None);
}

if build_target::target_arch().unwrap() == build_target::Arch::ARM {
// Enable ARM ASM optimisations
conf.enable("armasm", None);
}

// Build and return the config
conf.build()
}
Expand Down
Binary file not shown.

0 comments on commit d197e07

Please sign in to comment.