From 74646566e93de7551bfdfc5f49de7462f13d1d05 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Wed, 15 Mar 2023 18:41:09 -0400 Subject: [PATCH] Add CTRDBG_STATE to bssl::UniquePtr Change-Id: I18596751776262be09d8ba09ed258e1f66d90654 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/58046 Reviewed-by: Adam Langley Commit-Queue: David Benjamin --- crypto/fipsmodule/rand/ctrdrbg_test.cc | 6 ++---- include/openssl/ctrdrbg.h | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/crypto/fipsmodule/rand/ctrdrbg_test.cc b/crypto/fipsmodule/rand/ctrdrbg_test.cc index e6ebbca2e..50f42973f 100644 --- a/crypto/fipsmodule/rand/ctrdrbg_test.cc +++ b/crypto/fipsmodule/rand/ctrdrbg_test.cc @@ -63,13 +63,11 @@ TEST(CTRDRBGTest, Basic) { TEST(CTRDRBGTest, Allocated) { const uint8_t kSeed[CTR_DRBG_ENTROPY_LEN] = {0}; - CTR_DRBG_STATE *allocated = CTR_DRBG_new(kSeed, nullptr, 0); + bssl::UniquePtr allocated(CTR_DRBG_new(kSeed, nullptr, 0)); ASSERT_TRUE(allocated); - CTR_DRBG_free(allocated); - allocated = CTR_DRBG_new(kSeed, nullptr, 1<<20); + allocated.reset(CTR_DRBG_new(kSeed, nullptr, 1<<20)); ASSERT_FALSE(allocated); - CTR_DRBG_free(allocated); } TEST(CTRDRBGTest, Large) { diff --git a/include/openssl/ctrdrbg.h b/include/openssl/ctrdrbg.h index 62afe0c18..5440fb4d1 100644 --- a/include/openssl/ctrdrbg.h +++ b/include/openssl/ctrdrbg.h @@ -71,6 +71,12 @@ OPENSSL_EXPORT void CTR_DRBG_clear(CTR_DRBG_STATE *drbg); #if defined(__cplusplus) } // extern C + +extern "C++" { +BSSL_NAMESPACE_BEGIN +BORINGSSL_MAKE_DELETER(CTR_DRBG_STATE, CTR_DRBG_free) +BSSL_NAMESPACE_END +} // extern C++ #endif #endif // OPENSSL_HEADER_CTRDRBG_H