cloudflare · Noah-Kennedy · Mar 2, 2022 · Feb 25, 2022 · Mar 2, 2022 · Mar 2, 2022
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,59 +1,6 @@
-[package]
-name = "boringtun"
-description = "an implementation of the WireGuard® protocol designed for portability and speed"
-version = "0.4.0"
-authors = ["Noah Kennedy <nkennedy@cloudflare.com>", "Andy Grover <agrover@cloudflare.com>"]
-license = "BSD-3-Clause"
-repository = "https://github.com/cloudflare/boringtun"
-documentation = "https://docs.rs/boringtun/0.4.0/boringtun/"
-edition = "2018"
-
-[dependencies]
-base64 = "0.13"
-hex = "0.4"
-untrusted = "0.9.0"
-libc = "0.2"
-parking_lot = "0.12"
-tracing = "0.1.29"
-ip_network = "0.4.1"
-ip_network_table = "0.2.0"
-zeroize = { version = "1.5.2", features = ["zeroize_derive"]}
-ring = "0.16"
-
-[dependencies.tracing-subscriber]
-version = "0.3"
-optional = true
-
-[dependencies.tracing-appender]
-version = "0.2.0"
-optional = true
-
-[dev-dependencies]
-tracing-subscriber = "0.3"
-
-[target.'cfg(not(any(target_os="windows", target_os="ios", target_os="android")))'.dependencies]
-clap = { version = "2.33", default-features = false, features = ["suggestions"], optional = true }
-daemonize = { version = "0.4.1", optional = true }
-
-[target.'cfg(target_os="android")'.dependencies]
-jni = "0.19.0"
-
-[features]
-default = ["build-binary"]
-build-binary = ["tracing-subscriber", "tracing-appender", "clap", "daemonize"]
+[workspace]
+members = ["boringtun", "boringtun-cli"]
 
 [profile.release]
 lto = true        # Enable full link-time optimization.
-codegen-units = 1 # Use only 1 codegen-unit to enable full optimizations.
-
-[lib]
-crate-type = ["lib", "staticlib", "dylib"]
-
-[[bin]]
-name = "boringtun"
-path = "src/main.rs"
-required-features = ["build-binary"]
-
-[[example]]
-name = "benchmarks"
-path = "src/benchmarks_example.rs"
+codegen-units = 1 # Use only 1 codegen-unit to enable full optimizations.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -165,7 +165,7 @@ jobs:
           mkdir -p tmp/$name
           cp README.md \
             LICENSE.md \
-            tmp/$src/boringtun \
+            tmp/$src/boringtun-cli \
             tmp/$name/
           chmod +x tmp/$name/boringtun*
           tar czvf gh-release/$name.tar.gz -C tmp $name

diff --git a/boringtun-cli/Cargo.toml b/boringtun-cli/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "boringtun-cli"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+daemonize = "0.4.1"
+clap = "2.34.0"
+tracing = "0.1.31"
+tracing-subscriber = "0.3.9"
+tracing-appender = "0.2.1"
+
+# CHANGE THIS BEFORE EACH RELEASE
+[dependencies.boringtun]
+path = "../boringtun"
diff --git a/src/main.rs → boringtun-cli/src/main.rs b/src/main.rs → boringtun-cli/src/main.rs
@@ -1,16 +1,8 @@
 // Copyright (c) 2019 Cloudflare, Inc. All rights reserved.
 // SPDX-License-Identifier: BSD-3-Clause
 
-pub mod crypto;
-
-#[cfg(not(target_os = "windows"))]
-pub mod device;
-
-pub mod ffi;
-pub mod noise;
-
-use crate::device::drop_privileges::drop_privileges;
-use crate::device::{DeviceConfig, DeviceHandle};
+use boringtun::device::drop_privileges::drop_privileges;
+use boringtun::device::{DeviceConfig, DeviceHandle};
 use clap::{value_t, App, Arg};
 use daemonize::Daemonize;
 use std::fs::File;
@@ -20,7 +12,7 @@ use std::process::exit;
 fn check_tun_name(_v: String) -> Result<(), String> {
     #[cfg(any(target_os = "macos", target_os = "ios"))]
     {
-        if device::tun::parse_utun_name(&_v).is_ok() {
+        if boringtun::device::tun::parse_utun_name(&_v).is_ok() {
             Ok(())
         } else {
             Err("Tunnel name must have the format 'utun[0-9]+', use 'utun' for automatic assignment".to_owned())

diff --git a/boringtun/Cargo.toml b/boringtun/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "boringtun"
+description = "an implementation of the WireGuard® protocol designed for portability and speed"
+version = "0.4.0"
+authors = ["Noah Kennedy <nkennedy@cloudflare.com>", "Andy Grover <agrover@cloudflare.com>"]
+license = "BSD-3-Clause"
+repository = "https://github.com/cloudflare/boringtun"
+documentation = "https://docs.rs/boringtun/0.4.0/boringtun/"
+edition = "2018"
+
+[dependencies]
+base64 = "0.13"
+hex = "0.4"
+untrusted = "0.9.0"
+libc = "0.2"
+parking_lot = "0.12"
+tracing = "0.1.29"
+ip_network = "0.4.1"
+ip_network_table = "0.2.0"
+zeroize = { version = "1.5.2", features = ["zeroize_derive"]}
+ring = "0.16"
+
+[dev-dependencies]
+tracing-subscriber = "0.3"
+
+[target.'cfg(target_os="android")'.dependencies]
+jni = "0.19.0"
+
+[[example]]
+name = "benchmarks"
+path = "src/benchmarks_example.rs"
diff --git a/benches/mod.rs → boringtun/benches/mod.rs b/benches/mod.rs → boringtun/benches/mod.rs
diff --git a/src/benchmarks_example.rs → boringtun/src/benchmarks_example.rs b/src/benchmarks_example.rs → boringtun/src/benchmarks_example.rs
diff --git a/src/crypto/blake2s/mod.rs → boringtun/src/crypto/blake2s/mod.rs b/src/crypto/blake2s/mod.rs → boringtun/src/crypto/blake2s/mod.rs
diff --git a/src/crypto/blake2s/tests.rs → boringtun/src/crypto/blake2s/tests.rs b/src/crypto/blake2s/tests.rs → boringtun/src/crypto/blake2s/tests.rs
diff --git a/src/crypto/chacha20poly1305/mod.rs → boringtun/src/crypto/chacha20poly1305/mod.rs b/src/crypto/chacha20poly1305/mod.rs → boringtun/src/crypto/chacha20poly1305/mod.rs
diff --git a/src/crypto/chacha20poly1305/poly1305.rs → ...n/src/crypto/chacha20poly1305/poly1305.rs b/src/crypto/chacha20poly1305/poly1305.rs → ...n/src/crypto/chacha20poly1305/poly1305.rs
diff --git a/src/crypto/chacha20poly1305/tests.rs → ...gtun/src/crypto/chacha20poly1305/tests.rs b/src/crypto/chacha20poly1305/tests.rs → ...gtun/src/crypto/chacha20poly1305/tests.rs
diff --git a/src/crypto/mod.rs → boringtun/src/crypto/mod.rs b/src/crypto/mod.rs → boringtun/src/crypto/mod.rs
diff --git a/src/crypto/x25519/mod.rs → boringtun/src/crypto/x25519/mod.rs b/src/crypto/x25519/mod.rs → boringtun/src/crypto/x25519/mod.rs
diff --git a/src/crypto/x25519/tests.rs → boringtun/src/crypto/x25519/tests.rs b/src/crypto/x25519/tests.rs → boringtun/src/crypto/x25519/tests.rs
diff --git a/src/device/allowed_ips.rs → boringtun/src/device/allowed_ips.rs b/src/device/allowed_ips.rs → boringtun/src/device/allowed_ips.rs
diff --git a/src/device/api.rs → boringtun/src/device/api.rs b/src/device/api.rs → boringtun/src/device/api.rs
diff --git a/src/device/dev_lock.rs → boringtun/src/device/dev_lock.rs b/src/device/dev_lock.rs → boringtun/src/device/dev_lock.rs
diff --git a/src/device/drop_privileges.rs → boringtun/src/device/drop_privileges.rs b/src/device/drop_privileges.rs → boringtun/src/device/drop_privileges.rs
diff --git a/src/device/epoll.rs → boringtun/src/device/epoll.rs b/src/device/epoll.rs → boringtun/src/device/epoll.rs
diff --git a/src/device/integration_tests/mod.rs → ...ngtun/src/device/integration_tests/mod.rs b/src/device/integration_tests/mod.rs → ...ngtun/src/device/integration_tests/mod.rs
@@ -3,7 +3,7 @@
 
 // This module contains some integration tests for boringtun
 // Those tests require docker and sudo privileges to run
-#[cfg(test)]
+#[cfg(all(test, not(target_os = "macos")))]
 mod tests {
     use crate::crypto::{SystemRandom, X25519PublicKey, X25519SecretKey};
     use crate::device::{DeviceConfig, DeviceHandle};

diff --git a/src/device/kqueue.rs → boringtun/src/device/kqueue.rs b/src/device/kqueue.rs → boringtun/src/device/kqueue.rs
diff --git a/src/device/mod.rs → boringtun/src/device/mod.rs b/src/device/mod.rs → boringtun/src/device/mod.rs
diff --git a/src/device/peer.rs → boringtun/src/device/peer.rs b/src/device/peer.rs → boringtun/src/device/peer.rs
diff --git a/src/device/tun_darwin.rs → boringtun/src/device/tun_darwin.rs b/src/device/tun_darwin.rs → boringtun/src/device/tun_darwin.rs
diff --git a/src/device/tun_linux.rs → boringtun/src/device/tun_linux.rs b/src/device/tun_linux.rs → boringtun/src/device/tun_linux.rs
diff --git a/src/device/udp_unix.rs → boringtun/src/device/udp_unix.rs b/src/device/udp_unix.rs → boringtun/src/device/udp_unix.rs
diff --git a/src/ffi/benchmark.rs → boringtun/src/ffi/benchmark.rs b/src/ffi/benchmark.rs → boringtun/src/ffi/benchmark.rs
diff --git a/src/ffi/mod.rs → boringtun/src/ffi/mod.rs b/src/ffi/mod.rs → boringtun/src/ffi/mod.rs
diff --git a/src/jni.rs → boringtun/src/jni.rs b/src/jni.rs → boringtun/src/jni.rs
diff --git a/src/lib.rs → boringtun/src/lib.rs b/src/lib.rs → boringtun/src/lib.rs
diff --git a/src/noise/errors.rs → boringtun/src/noise/errors.rs b/src/noise/errors.rs → boringtun/src/noise/errors.rs
diff --git a/src/noise/handshake.rs → boringtun/src/noise/handshake.rs b/src/noise/handshake.rs → boringtun/src/noise/handshake.rs
diff --git a/src/noise/mod.rs → boringtun/src/noise/mod.rs b/src/noise/mod.rs → boringtun/src/noise/mod.rs
diff --git a/src/noise/rate_limiter.rs → boringtun/src/noise/rate_limiter.rs b/src/noise/rate_limiter.rs → boringtun/src/noise/rate_limiter.rs
diff --git a/src/noise/session.rs → boringtun/src/noise/session.rs b/src/noise/session.rs → boringtun/src/noise/session.rs
diff --git a/src/noise/tests.rs → boringtun/src/noise/tests.rs b/src/noise/tests.rs → boringtun/src/noise/tests.rs
diff --git a/src/noise/timers.rs → boringtun/src/noise/timers.rs b/src/noise/timers.rs → boringtun/src/noise/timers.rs
diff --git a/src/wireguard_ffi.h → boringtun/src/wireguard_ffi.h b/src/wireguard_ffi.h → boringtun/src/wireguard_ffi.h
diff --git a/ci/azure-build.yml b/ci/azure-build.yml
@@ -20,10 +20,10 @@ steps:
     displayName: 'Library integration tests'
   - script: |
       export PATH=$PATH:$HOME/.cargo/bin
-      cargo build --bin boringtun
+      cargo build --bin boringtun-cli
     displayName: 'Build executable'
   - ${{ if eq(parameters.runBinaryTests, 'true') }}:
     - script: |
         export PATH=$PATH:$HOME/.cargo/bin
-        cargo test --bin boringtun -- --test-threads=1
+        cargo test --bin boringtun-cli -- --test-threads=1
       displayName: 'Test executable'
diff --git a/ci/azure-create-release-build.yml b/ci/azure-create-release-build.yml
@@ -6,7 +6,7 @@ steps:
   - bash: |
       set -ex
       dst=$BUILD_ARTIFACTSTAGINGDIRECTORY
-      cp ${{ parameters.artifacts }}/boringtun $dst/
+      cp ${{ parameters.artifacts }}/boringtun-cli $dst/
     displayName: Create distribution tarball
   - task: PublishPipelineArtifact@0
     inputs: