From 6c198e40f6bcd560a7cc18d2ead46949b26c690d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Stankovi=C4=87?= <ivan.stankovic@wire.com>
Date: Mon, 8 Jul 2024 17:44:52 +0200
Subject: [PATCH] chore: remove dependency on a fork of RustCrypto/formats

Upstream has made a fix and released a new version of der_derive:
https://github.com/RustCrypto/formats/pull/1443
---
 Cargo.toml              | 5 +----
 crypto/Cargo.toml       | 2 +-
 deny.toml               | 2 --
 mls-provider/Cargo.toml | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e6d27cb121..f7d2ef7acf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,6 +19,7 @@ resolver = "2"
 [workspace.dependencies]
 rexie = "0.6.1"
 tls_codec = "0.4.0"
+x509-cert = "0.2"
 
 [workspace.dependencies.uniffi]
 version = "0.28"
@@ -69,10 +70,6 @@ git = "https://github.com/wireapp/openmls"
 #tag = "v1.0.0-pre.core-crypto-1.0.0"
 branch = "wire/stable"
 
-[patch.crates-io.x509-cert]
-git = "https://github.com/otak/formats"
-branch = "otak/x509-cert-wasm"
-
 # aarch64-apple-ios-sim target support has not yet been released
 [patch.crates-io.openssl-src]
 git = "https://github.com/alexcrichton/openssl-src-rs.git"
diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml
index fb29b9617a..5bbb8889cd 100644
--- a/crypto/Cargo.toml
+++ b/crypto/Cargo.toml
@@ -43,7 +43,7 @@ schnellru = "0.2"
 zeroize = "1.5"
 wire-e2e-identity = { workspace = true }
 indexmap = "2"
-x509-cert = "0.2"
+x509-cert = { workspace = true }
 pem = "3.0"
 async-recursion = "1"
 uniffi = { workspace = true, optional = true }
diff --git a/deny.toml b/deny.toml
index fac17196a3..b95ad4968c 100644
--- a/deny.toml
+++ b/deny.toml
@@ -61,8 +61,6 @@ license-files = [
 allow-git = [
     # ? Needed for our interop runner.
     "https://github.com/otak/fantoccini",
-    # ? Fix for wasm
-    "https://github.com/otak/formats?branch=otak/x509-cert-wasm",
     # ? Needed for rusqlite
     "https://github.com/alexcrichton/openssl-src-rs",
 ]
diff --git a/mls-provider/Cargo.toml b/mls-provider/Cargo.toml
index ac20252fd5..1bb4ff40eb 100644
--- a/mls-provider/Cargo.toml
+++ b/mls-provider/Cargo.toml
@@ -32,7 +32,7 @@ p384 = { version = "0.13", features = ["pkcs8"] }
 p521 = { version = "0.13", features = ["pkcs8"] }
 hkdf = "0.12"
 spki = { version = "0.7", features = ["pem", "fingerprint"] }
-x509-cert = { version = "0.2", features = ["builder", "hazmat"] }
+x509-cert = { workspace = true, features = ["builder", "hazmat"] }
 wire-e2e-identity = { workspace = true }
 fluvio-wasm-timer = "0.2"
 rand = { version = "0.8", features = ["getrandom"] }