Switch cert_compression_algs to GrowableArray.
It's much less typing than STACK_OF(T).
Change-Id: Idda99549ba35ff8d02fb6e3790f30f6566236076
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/38044
Reviewed-by: Dan McArdle <dmcardle@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
index 3deac7d..703c2bc 100644
--- a/ssl/ssl_lib.cc
+++ b/ssl/ssl_lib.cc
@@ -2251,36 +2251,17 @@
ssl_cert_decompression_func_t decompress) {
assert(compress != nullptr || decompress != nullptr);
- for (const auto *alg : ctx->cert_compression_algs.get()) {
- if (alg->alg_id == alg_id) {
+ for (const auto &alg : ctx->cert_compression_algs) {
+ if (alg.alg_id == alg_id) {
return 0;
}
}
- UniquePtr<CertCompressionAlg> alg = MakeUnique<CertCompressionAlg>();
- if (alg == nullptr) {
- return 0;
- }
-
- alg->alg_id = alg_id;
- alg->compress = compress;
- alg->decompress = decompress;
-
- if (ctx->cert_compression_algs == nullptr) {
- ctx->cert_compression_algs.reset(sk_CertCompressionAlg_new_null());
- if (ctx->cert_compression_algs == nullptr) {
- return 0;
- }
- }
-
- if (!PushToStack(ctx->cert_compression_algs.get(), std::move(alg))) {
- if (sk_CertCompressionAlg_num(ctx->cert_compression_algs.get()) == 0) {
- ctx->cert_compression_algs.reset();
- }
- return 0;
- }
-
- return 1;
+ CertCompressionAlg alg;
+ alg.alg_id = alg_id;
+ alg.compress = compress;
+ alg.decompress = decompress;
+ return ctx->cert_compression_algs.Push(alg);
}
void SSL_CTX_set_tls_channel_id_enabled(SSL_CTX *ctx, int enabled) {
