Const-correct sk_FOO_deep_copy's copy callback. This aligns with upstream OpenSSL, so it's hopefully more compatible. Code search says no one outside of the project uses this function, so it's unlikely to break anyone. Whether it makes things better is a bit of a wash: OBJ_dup and OPENSSL_strdup loose a pointless wrapper. X509_NAME_dup gains one, but hopefully that can be resolved once we solve the X509_NAME const-correctness problem. CRYPTO_BUFFER_up_ref gains one... really FOO_up_ref should have type const T * -> T *, but OpenSSL decided it returns int, so we've got to cast. Change-Id: Ifa6eaf26777ac7239db6021fc1eafcaed98e42c4 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/56032 Reviewed-by: Bob Beck <bbe@google.com> Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/tool/speed.cc b/tool/speed.cc index ee4b830..d600c28 100644 --- a/tool/speed.cc +++ b/tool/speed.cc
@@ -1062,9 +1062,9 @@ } static TRUST_TOKEN_PRETOKEN *trust_token_pretoken_dup( - TRUST_TOKEN_PRETOKEN *in) { - return (TRUST_TOKEN_PRETOKEN *)OPENSSL_memdup(in, - sizeof(TRUST_TOKEN_PRETOKEN)); + const TRUST_TOKEN_PRETOKEN *in) { + return static_cast<TRUST_TOKEN_PRETOKEN *>( + OPENSSL_memdup(in, sizeof(TRUST_TOKEN_PRETOKEN))); } static bool SpeedTrustToken(std::string name, const TRUST_TOKEN_METHOD *method,