beaconcrypt 0.3.0__tar.gz → 0.3.2__tar.gz

beaconcrypt-0.3.2/.github/workflows/go.yml

@@ -0,0 +1,136 @@
+name: Go Module
+
+on:
+  push:
+    tags:
+      - "[0-9]*.[0-9]*.[0-9]*"
+
+permissions:
+  contents: read
+
+env:
+  CARGO_TERM_COLOR: always
+  GOPROXY: https://proxy.golang.org
+  GONOSUMDB: ""
+
+jobs:
+  test:
+    name: Test Go module on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - ubuntu-24.04-arm
+          - macos-latest
+          - windows-latest
+
+    steps:
+      - uses: actions/checkout@v7
+
+      - name: Set up Go
+        uses: actions/setup-go@v6
+        with:
+          go-version-file: go.mod
+          check-latest: true
+
+      - name: Set up MinGW on Windows
+        if: runner.os == 'Windows'
+        uses: msys2/setup-msys2@v2
+        with:
+          install: mingw-w64-x86_64-gcc
+
+      - name: Install cap'n proto on Linux
+        if: runner.os == 'Linux'
+        run: sudo apt update && sudo apt install capnproto
+
+      - name: Install cap'n proto on macOS
+        if: runner.os == 'macOS'
+        run: brew install capnp
+
+      - name: Install cap'n proto on Windows
+        if: runner.os == 'Windows'
+        run: |
+          "C:\msys64\mingw64\bin" >> $env:GITHUB_PATH
+          curl.exe -O https://capnproto.org/capnproto-c++-win32-1.5.0.zip
+          Expand-Archive capnproto-c++-win32-1.5.0.zip
+          "$pwd\capnproto-c++-win32-1.5.0\capnproto-tools-win32-1.5.0" >> $env:GITHUB_PATH
+
+      - name: Build native library
+        if: runner.os != 'Windows'
+        run: cargo build --verbose
+
+      - name: Build native library on Windows
+        if: runner.os == 'Windows'
+        env:
+          CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: gcc
+        run: |
+          rustup target add x86_64-pc-windows-gnu
+          cargo build --verbose --target x86_64-pc-windows-gnu
+
+      - name: Test Go module
+        if: runner.os != 'Windows'
+        env:
+          CGO_ENABLED: 1
+        run: go test ./...
+
+      - name: Test Go module on Windows
+        if: runner.os == 'Windows'
+        env:
+          CGO_ENABLED: 1
+          CC: gcc
+        run: go test ./...
+
+  publish:
+    needs: test
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          fetch-depth: 0
+
+      - name: Set up Go
+        uses: actions/setup-go@v6
+        with:
+          go-version-file: go.mod
+          check-latest: true
+
+      - name: Publish module to Go proxy
+        run: |
+          module_path="$(go list -m)"
+          version="${GITHUB_REF_NAME}"
+          go_version="v${version}"
+
+          git fetch origin "refs/tags/${go_version}:refs/tags/${go_version}" || true
+          if ! git rev-parse --verify --quiet "refs/tags/${go_version}" >/dev/null; then
+            git tag "${go_version}" "${GITHUB_SHA}"
+            git push origin "refs/tags/${go_version}"
+          fi
+
+          tag_visible=false
+          for attempt in {1..30}; do
+            if git ls-remote --exit-code --tags origin "refs/tags/${go_version}" >/dev/null; then
+              tag_visible=true
+              break
+            fi
+            sleep 10
+          done
+          if [ "${tag_visible}" != "true" ]; then
+            echo "Timed out waiting for ${go_version} to become visible on origin" >&2
+            exit 1
+          fi
+
+          GOPROXY=direct go list -m "${module_path}@${go_version}"
+
+          for attempt in {1..30}; do
+            if go list -m "${module_path}@${go_version}"; then
+              exit 0
+            fi
+            sleep 10
+          done
+
+          go list -m "${module_path}@${go_version}"

{beaconcrypt-0.3.0 → beaconcrypt-0.3.2}/.github/workflows/python.yml

@@ -11,7 +11,7 @@ name: Upload Python Package
 on:
   push:
     tags:
-      - "**"
+      - "[0-9]*.[0-9]*.[0-9]*"
 
 permissions:
   contents: read

{beaconcrypt-0.3.0 → beaconcrypt-0.3.2}/.github/workflows/release.yml

@@ -2,7 +2,8 @@ name: Release
 
 on:
   push: 
-    tags: '*'
+    tags:
+      - "[0-9]*.[0-9]*.[0-9]*"
 
 env:
   CARGO_TERM_COLOR: always

{beaconcrypt-0.3.0 → beaconcrypt-0.3.2}/Cargo.lock

@@ -84,7 +84,7 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "beaconcrypt"
-version = "0.3.0"
+version = "0.3.2"
 dependencies = [
  "capnp",
  "capnpc",
@@ -99,9 +99,9 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "2.13.0"
+version = "2.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
+checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
 
 [[package]]
 name = "bumpalo"
@@ -1166,9 +1166,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.23.5"
+version = "1.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea5fab0d6c3c01ae70085a09cb03d4c7a1d6314e2b3e075392783396d724ca0a"
+checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239"
 dependencies = [
  "getrandom",
  "js-sys",

{beaconcrypt-0.3.0 → beaconcrypt-0.3.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "beaconcrypt"
-version = "0.3.0"
+version = "0.3.2"
 edition = "2024"
 license-file = "LICENSE"
 readme = "README.md"

{beaconcrypt-0.3.0 → beaconcrypt-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beaconcrypt
-Version: 0.3.0
+Version: 0.3.2
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{beaconcrypt-0.3.0 → beaconcrypt-0.3.2}/README.md

@@ -46,13 +46,18 @@ Test the C interface
 # Reference implementation
 I don't use rust a lot, so the code is probably fairly naive. It provides both a beacon and server implementation with C bindings through `cbindgen`. Ideally more bindings would be built on top of that so it can be used in the mythic server-side.
 
+## Building
+You will need [Capn'Proto](https://capnproto.org/install.html) (just the binaries) and a recent version of rust for every build.
+
+For windows, I prefer building with stable-gnu for normal usage, and nightly-gnu for release builds. You can find the exact arguments I use to the the static library as small as possible in [release.yml](/.github\workflows\release.yml). The MSVC toolchain is expected to work just as well, I just like mingw.
+
 ## Profiles
 The reference implementation has two profiles: `PQXDH` and `CNSA2`. Profiles are controlled by cargo features. The CNSA2 profile only exists as a test for now. It uses a simple ML-KEM encapsulation for key exchange and the underlying libraries are not FIPS-approved. It is experimental and is likely broken. PQXDH is the intended target and the default.
 
 ## Usage
 The reference implementation is a library that can currently be used either from rust or through C FFI. The C interface is currently not tested.
 
-From rust, usage is mostly just instanciating `CryptoProvider` objects. When using the C FFI, the library creates a global `CryptoProvider` object, whose methods are wrapped by the various functions in the interface.
+From rust, usage is mostly just instanciating `CryptoProvider` objects. When using the C FFI, the library creates a global `CryptoProvider` object, whose methods are wrapped by the various functions in the interface. Look at tests for examples.
 
 # Copyright
 This work is dedicated to the public domain.

{beaconcrypt-0.3.0 → beaconcrypt-0.3.2}/beaconcrypt.go

@@ -4,7 +4,8 @@ package beaconcrypt
 
 /*
 #cgo windows LDFLAGS: -L${SRCDIR}/target/x86_64-pc-windows-gnu/debug -l:libbeaconcrypt.a -lbcrypt -lws2_32 -luserenv -ldbghelp -lntdll
-#cgo !windows LDFLAGS: -L${SRCDIR}/target/debug -l:libbeaconcrypt.a
+#cgo linux LDFLAGS: -L${SRCDIR}/target/debug -l:libbeaconcrypt.a
+#cgo darwin LDFLAGS: ${SRCDIR}/target/debug/libbeaconcrypt.a
 #include <stdint.h>
 #include <stdlib.h>
 

{beaconcrypt-0.3.0 → beaconcrypt-0.3.2}/src/pqxdh.rs

@@ -331,6 +331,9 @@ impl ProviderBeacon for BeaconCryptPqxdh {
 			crypto_kx::PublicKey::from_bytes(response.get_ephemeral_key().ok()?).ok()?;
 		let server_id =
 			crypto_sign::PublicKey::from_bytes(response.get_identity_key().ok()?).ok()?;
+		if server_id != self.server_id()?.clone() {
+			return None;
+		}
 		let server_kex_id = crypto_sign::ed25519_pk_to_curve25519(&server_id).ok()?;
 		let beacon_kex_id = crypto_sign::ed25519_sk_to_curve25519(self.identity_sk()).ok()?;
 		let shared_secret =
@@ -353,7 +356,6 @@ impl ProviderBeacon for BeaconCryptPqxdh {
 		let derived_secret = derive_root_key(dh1, dh2, dh3, dh4, shared_secret).ok()?;
 		self.delete_onetime_keypair();
 
-		self.add_server_pk(server_id.clone());
 		self.set_identity_kid(response.get_key_id());
 		let id = self.identity_pk().clone();
 		self.set_associated_data(build_additional_data(server_id, id));

beaconcrypt-0.3.0/.github/workflows/go.yml

@@ -1,44 +0,0 @@
-name: Go Module
-
-on:
-  push:
-    tags:
-      - "*"
-
-permissions:
-  contents: read
-
-env:
-  CARGO_TERM_COLOR: always
-  GOPROXY: https://proxy.golang.org
-  GONOSUMDB: ""
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v7
-
-      - name: Set up Go
-        uses: actions/setup-go@v6
-        with:
-          go-version-file: go.mod
-          check-latest: true
-
-      - name: Install cap'n proto
-        run: sudo apt update && sudo apt install capnproto
-
-      - name: Build native library
-        run: cargo build --verbose
-
-      - name: Test Go module
-        run: go test ./...
-
-      - name: Publish module to Go proxy
-        run: |
-          module_path="$(go list -m)"
-          version="${GITHUB_REF_NAME}"
-          encoded_module="${module_path,,}"
-          curl --fail --show-error --location --retry 5 --retry-all-errors --retry-delay 10 \
-            "https://proxy.golang.org/${encoded_module}/@v/v${version}.info"