Commit e670e903 authored by Todd Short's avatar Todd Short Committed by Pauli
Browse files

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: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4436)
parent e1c7871d

ssl/s3_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */