beaconcrypt 0.3.1__tar.gz → 0.3.4__tar.gz

{beaconcrypt-0.3.1 → beaconcrypt-0.3.4}/.github/workflows/python.yml

@@ -31,6 +31,11 @@ jobs:
         run: |
           sudo apt install capnproto
 
+      - name: Run Python tests
+        run: |
+          uv run --group dev maturin develop --bindings pyo3 --features pybinds
+          uv run --group dev pytest tests
+
       - name: Build source distribution
         run: uvx maturin sdist --out dist
 

{beaconcrypt-0.3.1 → beaconcrypt-0.3.4}/Cargo.lock

@@ -84,7 +84,7 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "beaconcrypt"
-version = "0.3.1"
+version = "0.3.4"
 dependencies = [
  "capnp",
  "capnpc",

{beaconcrypt-0.3.1 → beaconcrypt-0.3.4}/Cargo.toml

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

{beaconcrypt-0.3.1 → beaconcrypt-0.3.4}/PKG-INFO

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

{beaconcrypt-0.3.1 → beaconcrypt-0.3.4}/README.md

@@ -57,7 +57,7 @@ The reference implementation has two profiles: `PQXDH` and `CNSA2`. Profiles are
 ## 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.1 → beaconcrypt-0.3.4}/beaconcrypt_test.go

@@ -58,7 +58,11 @@ func newBeacon(t *testing.T, serverPK []byte) *Beacon {
 
 func TestRegister(t *testing.T) {
 	server := newServer(t)
-	beacon := newBeacon(t, nil)
+	serverPK, err := server.IdentityPK()
+	if err != nil {
+		t.Fatal(err)
+	}
+	beacon := newBeacon(t, serverPK)
 
 	if registerBeacon(t, server, beacon) == nil {
 		t.Fatal("expected registration to return initial message")
@@ -67,8 +71,12 @@ func TestRegister(t *testing.T) {
 
 func TestEncryptToMultiple(t *testing.T) {
 	server := newServer(t)
-	b1 := newBeacon(t, nil)
-	b2 := newBeacon(t, nil)
+	serverPK, err := server.IdentityPK()
+	if err != nil {
+		t.Fatal(err)
+	}
+	b1 := newBeacon(t, serverPK)
+	b2 := newBeacon(t, serverPK)
 	message := bytes.Repeat([]byte{0x01}, 32)
 
 	b1Initial := registerBeacon(t, server, b1)
@@ -92,7 +100,11 @@ func TestEncryptToMultiple(t *testing.T) {
 
 func TestEncryptMultiple(t *testing.T) {
 	server := newServer(t)
-	b1 := newBeacon(t, nil)
+	serverPK, err := server.IdentityPK()
+	if err != nil {
+		t.Fatal(err)
+	}
+	b1 := newBeacon(t, serverPK)
 	message := bytes.Repeat([]byte{0x01}, 32)
 
 	registerBeacon(t, server, b1)
@@ -112,7 +124,11 @@ func TestEncryptMultiple(t *testing.T) {
 
 func TestDecryptMultiple(t *testing.T) {
 	server := newServer(t)
-	beacon := newBeacon(t, nil)
+	serverPK, err := server.IdentityPK()
+	if err != nil {
+		t.Fatal(err)
+	}
+	beacon := newBeacon(t, serverPK)
 	message := bytes.Repeat([]byte{0x01}, 32)
 
 	registerBeacon(t, server, beacon)
@@ -143,7 +159,11 @@ func TestDecryptMultiple(t *testing.T) {
 
 func TestDecryptMultipleSigned(t *testing.T) {
 	server := newServer(t)
-	beacon := newBeacon(t, nil)
+	serverPK, err := server.IdentityPK()
+	if err != nil {
+		t.Fatal(err)
+	}
+	beacon := newBeacon(t, serverPK)
 	message := bytes.Repeat([]byte{0x01}, 32)
 
 	registerBeacon(t, server, beacon)

{beaconcrypt-0.3.1 → beaconcrypt-0.3.4}/pyproject.toml

@@ -12,6 +12,10 @@ classifiers = [
 ]
 dynamic = ["version"]
 
+[tool.maturin]
+bindings = "pyo3"
+features = ["pybinds"]
+
 [dependency-groups]
 dev = [
     "black>=26.5.1",

{beaconcrypt-0.3.1 → beaconcrypt-0.3.4}/src/lib.rs

@@ -475,9 +475,9 @@ pub mod beaconcrypt_py {
 	#[pymethods]
 	impl Beacon {
 		#[new]
-		fn new(server_kid: u64, server_id_pk: Option<&[u8]>) -> Self {
+		fn new(server_kid: u64, server_id_pk: &[u8]) -> Self {
 			Self {
-				_0: BeaconCryptPqxdh::new(true, server_kid, server_id_pk, None),
+				_0: BeaconCryptPqxdh::new(true, server_kid, Some(server_id_pk), None),
 			}
 		}
 

{beaconcrypt-0.3.1 → beaconcrypt-0.3.4}/src/pqxdh.rs

@@ -143,7 +143,7 @@ impl CryptoProvider for BeaconCryptPqxdh {
 		let signed = crypto_sign::sign(data, self.identity_sk()).ok()?;
 		builder.set_data(&signed);
 		let mut buffer = vec![];
-		capnp::serialize_packed::write_message(&mut buffer, t_builder.borrow_inner()).unwrap();
+		capnp::serialize_packed::write_message(&mut buffer, t_builder.borrow_inner()).ok()?;
 		Some(buffer)
 	}
 
@@ -315,7 +315,7 @@ impl ProviderBeacon for BeaconCryptPqxdh {
 		bundle.set_pq_key(&pq_sig);
 
 		let mut buffer = vec![];
-		capnp::serialize::write_message(&mut buffer, msg.borrow_inner()).unwrap();
+		capnp::serialize::write_message(&mut buffer, msg.borrow_inner()).ok()?;
 		Some(buffer)
 	}
 
@@ -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));
@@ -372,17 +374,16 @@ impl ProviderBeacon for BeaconCryptPqxdh {
 #[cfg(feature = "server")]
 impl ProviderServer for BeaconCryptPqxdh {
 	fn get_shared_secret(&mut self, buffer: &[u8]) -> Option<RegistrationOutput> {
-		let reader = capnp::serialize::read_message(buffer, ReaderOptions::new()).unwrap();
+		let reader = capnp::serialize::read_message(buffer, ReaderOptions::new()).ok()?;
 		let typed_reader = TypedReader::<_, phase1_capnp::init_kex::Owned>::new(reader);
-		let registration = typed_reader.get().unwrap();
+		let registration = typed_reader.get().ok()?;
 
 		let decoded_beacon_id = decode_sign(registration.get_identity_key().ok()?).ok()?;
 		let remote_id = crypto_sign::PublicKey::from_bytes(&decoded_beacon_id).ok()?;
-		let pq_verified = crypto_sign::verify(registration.get_pq_key().ok()?, &remote_id).unwrap();
-		let prekey_verified =
-			crypto_sign::verify(registration.get_pre_key().ok()?, &remote_id).unwrap();
+		let pq_verified = crypto_sign::verify(registration.get_pq_key().ok()?, &remote_id)?;
+		let prekey_verified = crypto_sign::verify(registration.get_pre_key().ok()?, &remote_id)?;
 		let onetime_verified =
-			crypto_sign::verify(registration.get_one_time_key().ok()?, &remote_id).unwrap();
+			crypto_sign::verify(registration.get_one_time_key().ok()?, &remote_id)?;
 
 		let beacon_prekey =
 			crypto_kx::PublicKey::from_bytes(&decode_kem(&prekey_verified).ok()?).ok()?;

{beaconcrypt-0.3.1 → beaconcrypt-0.3.4}/tests/test_encryption.py

@@ -18,8 +18,9 @@ def register_beacon(
 
 def test_encrypt_to_multiple():
     server = BeaconCryptServer(0, None)
-    b1 = BeaconCryptBeacon(0, None)
-    b2 = BeaconCryptBeacon(0, None)
+    server_pk = server.id_pk()
+    b1 = BeaconCryptBeacon(0, server_pk)
+    b2 = BeaconCryptBeacon(0, server_pk)
     message = bytes(0x1 * 32)
 
     b1_initial = register_beacon(server, b1)
@@ -33,7 +34,8 @@ def test_encrypt_to_multiple():
 
 def test_encrypt_multiple():
     server = BeaconCryptServer(0, None)
-    b1 = BeaconCryptBeacon(0, None)
+    server_pk = server.id_pk()
+    b1 = BeaconCryptBeacon(0, server_pk)
     message = bytes(0x1 * 32)
 
     _ = register_beacon(server, b1)
@@ -45,7 +47,8 @@ def test_encrypt_multiple():
 
 def test_decrypt_multiple():
     server = BeaconCryptServer(0, None)
-    beacon = BeaconCryptBeacon(0, None)
+    server_pk = server.id_pk()
+    beacon = BeaconCryptBeacon(0, server_pk)
     message = bytes(0x1 * 32)
 
     _ = register_beacon(server, beacon)
@@ -61,7 +64,8 @@ def test_decrypt_multiple():
 
 def test_decrypt_multiple_signed():
     server = BeaconCryptServer(0, None)
-    beacon = BeaconCryptBeacon(0, None)
+    server_pk = server.id_pk()
+    beacon = BeaconCryptBeacon(0, server_pk)
     message = bytes(0x1 * 32)
 
     _ = register_beacon(server, beacon)

{beaconcrypt-0.3.1 → beaconcrypt-0.3.4}/tests/test_registration.py

@@ -18,6 +18,7 @@ def register_beacon(
 
 def test_register():
     server = BeaconCryptServer(0, None)
-    beacon = BeaconCryptBeacon(0, None)
+    server_pk = server.id_pk()
+    beacon = BeaconCryptBeacon(0, server_pk)
 
     assert register_beacon(server, beacon) is not None