use double indirection for rustls_client_cert_verifier

Author: cpu

src/cipher.rs

@@ -585,18 +585,16 @@ impl CastPtr for rustls_client_cert_verifier {
     type RustType = Arc<dyn ClientCertVerifier>;
 }
 
-impl ArcCastPtr for rustls_client_cert_verifier {}
+impl BoxCastPtr for rustls_client_cert_verifier {}
 
 impl rustls_client_cert_verifier {
     /// Free a `rustls_client_cert_verifier` previously returned from
     /// `rustls_client_cert_verifier_builder_build`. Calling with NULL is fine. Must not be
     /// called twice with the same value.
     #[no_mangle]
-    pub extern "C" fn rustls_client_cert_verifier_free(
-        verifier: *const rustls_client_cert_verifier,
-    ) {
+    pub extern "C" fn rustls_client_cert_verifier_free(verifier: *mut rustls_client_cert_verifier) {
         ffi_panic_boundary! {
-            ArcCastPtr::free(verifier);
+            BoxCastPtr::to_box(verifier);
         }
     }
 }
@@ -718,7 +716,7 @@ impl rustls_web_pki_client_cert_verifier_builder {
     #[no_mangle]
     pub extern "C" fn rustls_web_pki_client_cert_verifier_builder_build(
         builder: *mut rustls_web_pki_client_cert_verifier_builder,
-        verifier_out: *mut *const rustls_client_cert_verifier,
+        verifier_out: *mut *mut rustls_client_cert_verifier,
     ) -> rustls_result {
         ffi_panic_boundary! {
             let client_verifier_builder: &mut Option<ClientCertVerifierBuilder> = try_mut_from_ptr!(builder);
@@ -738,7 +736,7 @@ impl rustls_web_pki_client_cert_verifier_builder {
                 Err(e) => return error::map_verifier_builder_error(e),
             };
 
-            ArcCastPtr::set_mut_ptr(verifier_out, verifier);
+            BoxCastPtr::set_mut_ptr(verifier_out, verifier);
 
             rustls_result::Ok
         }

src/rustls.h

@@ -984,7 +984,7 @@ void rustls_root_cert_store_free(const struct rustls_root_cert_store *store);
  * `rustls_client_cert_verifier_builder_build`. Calling with NULL is fine. Must not be
  * called twice with the same value.
  */
-void rustls_client_cert_verifier_free(const struct rustls_client_cert_verifier *verifier);
+void rustls_client_cert_verifier_free(struct rustls_client_cert_verifier *verifier);
 
 /**
  * Create a `rustls_web_pki_client_cert_verifier_builder`. Caller owns the memory and must
@@ -1027,7 +1027,7 @@ rustls_result rustls_web_pki_client_cert_verifier_builder_add_crl(struct rustls_
  * `rustls_web_pki_client_cert_verifier_builder_free` for details about lifetime.
  */
 rustls_result rustls_web_pki_client_cert_verifier_builder_build(struct rustls_web_pki_client_cert_verifier_builder *builder,
-                                                                const struct rustls_client_cert_verifier **verifier_out);
+                                                                struct rustls_client_cert_verifier **verifier_out);
 
 /**
  * Free a `rustls_client_cert_verifier_builder` previously returned from

tests/server.c

@@ -242,7 +242,7 @@ main(int argc, const char **argv)
   const struct rustls_root_cert_store *client_cert_root_store = NULL;
   struct rustls_web_pki_client_cert_verifier_builder
     *client_cert_verifier_builder = NULL;
-  const struct rustls_client_cert_verifier *client_cert_verifier = NULL;
+  struct rustls_client_cert_verifier *client_cert_verifier = NULL;
 
   /* Set this global variable for logging purposes. */
   programname = "server";