commit b1ff33d58e7465ea2ca8dc5f6416c456bb402086
author David Benjamin <davidben@google.com> Thu Jul 20 10:53:36 2023 -0400
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jul 20 15:31:03 2023 +0000
tree 36ec5b5c0d445ac3f93c95ce1325c38f568c1b15
parent e8dab191c0e2ceba37dcb28d37c50e01a6c2bf3b

Temporarily restore sk_pop_free_ex

This is a temporary workaround for b/291994116

Bug: b:291994116
Change-Id: I5b0372e07cf3bdf4b6a5b4b37dabea828ad026a8
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/61885
Auto-Submit: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: Bob Beck <bbe@google.com>

crypto/stack/stack.c

diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index 0bb5041..a326eb7 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -532,3 +532,8 @@
 size_t sk_push(OPENSSL_STACK *sk, void *p) { return OPENSSL_sk_push(sk, p); }
 
 void *sk_pop(OPENSSL_STACK *sk) { return OPENSSL_sk_pop(sk); }
+
+void sk_pop_free_ex(OPENSSL_STACK *sk, OPENSSL_sk_call_free_func call_free_func,
+                    OPENSSL_sk_free_func free_func) {
+  OPENSSL_sk_pop_free_ex(sk, call_free_func, free_func);
+}

include/openssl/stack.h

diff --git a/include/openssl/stack.h b/include/openssl/stack.h
index 812bccf..100b1db 100644
--- a/include/openssl/stack.h
+++ b/include/openssl/stack.h
@@ -344,9 +344,16 @@
 OPENSSL_EXPORT size_t sk_push(OPENSSL_STACK *sk, void *p);
 OPENSSL_EXPORT void *sk_pop(OPENSSL_STACK *sk);
 
-// sk_pop_free behaves like |sk_pop_free_ex| but performs an invalid function
-// pointer cast. It exists because some existing callers called |sk_pop_free|
-// directly.
+// sk_pop_free_ex calls |OPENSSL_sk_pop_free_ex|.
+//
+// TODO(b/291994116): Remove this.
+OPENSSL_EXPORT void sk_pop_free_ex(OPENSSL_STACK *sk,
+                                   OPENSSL_sk_call_free_func call_free_func,
+                                   OPENSSL_sk_free_func free_func);
+
+// sk_pop_free behaves like |OPENSSL_sk_pop_free_ex| but performs an invalid
+// function pointer cast. It exists because some existing callers called
+// |sk_pop_free| directly.
 //
 // TODO(davidben): Migrate callers to bssl::UniquePtr and remove this.
 OPENSSL_EXPORT void sk_pop_free(OPENSSL_STACK *sk,