Merge branch 'main' of github.com:bitwarden/sdk into ps/tde

# Conflicts:
#	crates/bitwarden-crypto/src/device_key.rs
#	crates/bitwarden-crypto/src/enc_string/asymmetric.rs
#	crates/bitwarden-crypto/src/rsa.rs
#	crates/bitwarden/src/crypto/mod.rs

.github/workflows/build-rust-crates.yml

@@ -29,6 +29,7 @@ jobs:
 
         package:
           - bitwarden
+          - bitwarden-crypto
           - bitwarden-api-api
           - bitwarden-api-identity
 

.github/workflows/publish-rust-crates.yml

@@ -29,6 +29,11 @@ on:
         required: true
         default: true
         type: boolean
+      publish_bitwarden-crypto:
+        description: "Publish bitwarden-crypto crate"
+        required: true
+        default: true
+        type: boolean
 
 defaults:
   run:
@@ -61,6 +66,7 @@ jobs:
           PUBLISH_BITWARDEN: ${{ github.event.inputs.publish_bitwarden }}
           PUBLISH_BITWARDEN_API_API: ${{ github.event.inputs.publish_bitwarden-api-api }}
           PUBLISH_BITWARDEN_API_IDENTITY: ${{ github.event.inputs.publish_bitwarden-api-identity }}
+          PUBLISH_BITWARDEN_CRYPTO: ${{ github.event.inputs.publish_bitwarden-crypto }}
         run: |
           if [[ "$PUBLISH_BITWARDEN" == "false" ]] && [[ "$PUBLISH_BITWARDEN_API_API" == "false" ]] && [[ "$PUBLISH_BITWARDEN_API_IDENTITY" == "false" ]]; then
             echo "==================================="
@@ -87,6 +93,11 @@ jobs:
             PACKAGES_LIST="$PACKAGES_LIST bitwarden-api-identity"
           fi
 
+          if [[ "$PUBLISH_BITWARDEN_CRYPTO" == "true" ]]; then
+            PACKAGES_COMMAND="$PACKAGES_COMMAND -p bitwarden-crypto"
+            PACKAGES_LIST="$PACKAGES_LIST bitwarden-crypto"
+          fi
+
           echo "Packages command: " $PACKAGES_COMMAND
           echo "Packages list: " $PACKAGES_LIST
 

.github/workflows/version-bump.yml

@@ -10,12 +10,13 @@ on:
         required: true
         type: choice
         options:
-          - napi
           - bitwarden
           - bitwarden-api-api
           - bitwarden-api-identity
-          - cli
+          - bitwarden-crypto
           - bitwarden-json
+          - cli
+          - napi
       version_number:
         description: "New version (example: '2024.1.0')"
         required: true
@@ -116,6 +117,12 @@ jobs:
         if: ${{ inputs.project == 'bitwarden-api-identity' }}
         run: cargo-set-version set-version -p bitwarden-api-identity ${{ inputs.version_number }}
 
+      ### bitwarden-crypto
+
+      - name: Bump bitwarden-crypto crate Version
+        if: ${{ inputs.project == 'bitwarden-crypto' }}
+        run: cargo-set-version set-version -p bitwarden-crypto ${{ inputs.version_number }}
+
       ### cli
 
       - name: Bump cli Version

.gitignore

@@ -50,8 +50,7 @@ languages/swift/BitwardenFFI.xcframework
 languages/swift/tmp
 languages/swift/.build
 languages/swift/.swiftpm
-languages/kotlin/sdk/src/main/java/com/bitwarden/sdk/bitwarden_uniffi.kt
-languages/kotlin/sdk/src/main/java/com/bitwarden/core/bitwarden.kt
+languages/kotlin/sdk/src/main/java/com/bitwarden/**/*.kt
 
 # Schemas
 crates/bitwarden-napi/src-ts/bitwarden_client/schemas.ts

crates/bitwarden-cli/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 rust-version = "1.57"
 
 [dependencies]
-clap = { version = "4.4.13", features = ["derive"] }
+clap = { version = "4.4.16", features = ["derive"] }
 color-eyre = "0.6"
 inquire = "0.6.2"
 supports-color = "2.1.0"

crates/bitwarden-crypto/Cargo.toml

@@ -0,0 +1,45 @@
+[package]
+name = "bitwarden-crypto"
+version = "0.1.0"
+authors = ["Bitwarden Inc"]
+license-file = "LICENSE"
+repository = "https://github.com/bitwarden/sdk"
+homepage = "https://bitwarden.com"
+description = """
+Bitwarden Cryptographic primitives
+"""
+keywords = ["bitwarden"]
+edition = "2021"
+rust-version = "1.57"
+
+[features]
+default = []
+
+mobile = ["uniffi"]
+
+[dependencies]
+aes = ">=0.8.2, <0.9"
+argon2 = { version = ">=0.5.0, <0.6", features = [
+    "alloc",
+], default-features = false }
+base64 = ">=0.21.2, <0.22"
+cbc = { version = ">=0.1.2, <0.2", features = ["alloc"] }
+hkdf = ">=0.12.3, <0.13"
+hmac = ">=0.12.1, <0.13"
+num-bigint = ">=0.4, <0.5"
+num-traits = ">=0.2.15, <0.3"
+pbkdf2 = { version = ">=0.12.1, <0.13", default-features = false }
+rand = ">=0.8.5, <0.9"
+rsa = ">=0.9.2, <0.10"
+schemars = { version = ">=0.8, <0.9", features = ["uuid1"] }
+serde = { version = ">=1.0, <2.0", features = ["derive"] }
+sha1 = ">=0.10.5, <0.11"
+sha2 = ">=0.10.6, <0.11"
+subtle = ">=2.5.0, <3.0"
+thiserror = ">=1.0.40, <2.0"
+uniffi = { version = "=0.25.2", optional = true }
+uuid = { version = ">=1.3.3, <2.0", features = ["serde"] }
+
+[dev-dependencies]
+rand_chacha = "0.3.1"
+serde_json = ">=1.0.96, <2.0"