diff options
| author | Todd Short <tshort@akamai.com> | 2017-10-04 09:15:19 -0400 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2017-11-30 07:13:09 +1000 |
| commit | e670e90319b902de528db0d22d7197b5de1f4891 (patch) | |
| tree | a70e244c0fc3fe043ed989978a20a16b51e7bc27 /ssl/s3_lib.c | |
| parent | e1c7871de80029b81824df4d59edc6de5293835f (diff) | |
Add sk_new_reserve support
This is a specific 1.1.1 change; do not squash if the chacha
prioritization code is to be backported
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4436)
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index c063fff87a..e71373d2bf 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -4173,7 +4173,7 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt, } } if (found) { - prio_chacha = sk_SSL_CIPHER_new_null(); + prio_chacha = sk_SSL_CIPHER_new_reserve(NULL, num); /* if reserve fails, then there's likely a memory issue */ if (prio_chacha != NULL) { /* Put all ChaCha20 at the top, starting with the one we just found */ |