Skip to content

Commit

Permalink
Use Plaintext Header for SQLite (#1054)
Browse files Browse the repository at this point in the history
* implement plaintext header

* use encrypted db by default in tests

* add more logs to streams
  • Loading branch information
insipx authored Sep 12, 2024
1 parent 37196ca commit 6b7a163
Show file tree
Hide file tree
Showing 18 changed files with 541 additions and 279 deletions.
20 changes: 1 addition & 19 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

81 changes: 5 additions & 76 deletions bindings_ffi/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions bindings_ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@ version = "0.0.1"
crate-type = ["lib", "cdylib", "staticlib"]

[dependencies]
env_logger = "0.11.3"
futures = "0.3.28"
log = { version = "0.4", features = ["std"] }
parking_lot = "0.12.3"
thiserror = "1.0"
thread-id = "4.2.1"
tokio = { version = "1.28.1", features = ["macros"] }
uniffi = { version = "0.28.0", features = ["tokio", "cli"] }
uniffi_macros = "0.28.0"
xmtp_api_grpc = { path = "../xmtp_api_grpc" }
xmtp_cryptography = { path = "../xmtp_cryptography" }
xmtp_id = { path = "../xmtp_id" }
Expand All @@ -24,8 +22,7 @@ xmtp_proto = { path = "../xmtp_proto", features = ["proto_full"] }
xmtp_user_preferences = { path = "../xmtp_user_preferences" }
xmtp_v2 = { path = "../xmtp_v2" }

tracing-subscriber = { version = "0.3", features = ["env-filter"] }
# NOTE: A regression in openssl-sys exists where libatomic is dynamically linked
# NOTE: A regression in openssl-sys exists where libatomic is dynamically linked
# for i686-linux-android targets. https://github.com/sfackler/rust-openssl/issues/2163
#
# This is fixed in the openssl-sys fork at
Expand All @@ -50,6 +47,7 @@ tokio-test = "0.4"
tracing-subscriber = "0.3"
uniffi = { version = "0.28.0", features = ["bindgen-tests"] }
uuid = { version = "1.9", features = ["v4", "fast-rng"] }
xmtp_mls = { path = "../xmtp_mls", features = ["native", "test-utils"] }

# NOTE: The release profile reduces bundle size from 230M to 41M - may have performance impliciations
# https://stackoverflow.com/a/54842093
Expand Down
2 changes: 1 addition & 1 deletion bindings_ffi/src/mls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1720,7 +1720,7 @@ mod tests {
xmtp_api_grpc::LOCALHOST_ADDRESS.to_string(),
false,
Some(tmp_path()),
None,
Some(xmtp_mls::storage::EncryptedMessageStore::generate_enc_key().into()),
&inbox_id,
ffi_inbox_owner.get_address(),
nonce,
Expand Down
Loading

0 comments on commit 6b7a163

Please sign in to comment.