Commit f560ff62 authored Sep 18, 2018 by Dr. Matthias St. Pierre

ssl/ssl_ciph.c: make set_ciphersuites static



Fixes #7252

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7253)

(cherry picked from commit f9a22815f386dbe7a13822f0ac3629ae8521cd76)

parent cfacc73a

ssl/ssl_ciph.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1301,7 +1301,7 @@ static int ciphersuite_cb(const char elem, int len, void arg)
	return 1;		return 1;
	}		}

	int set_ciphersuites(STACK_OF(SSL_CIPHER) *currciphers, const char str)		static __owur int set_ciphersuites(STACK_OF(SSL_CIPHER) *currciphers, const char str)
	{		{
	STACK_OF(SSL_CIPHER) *newciphers = sk_SSL_CIPHER_new_null();		STACK_OF(SSL_CIPHER) *newciphers = sk_SSL_CIPHER_new_null();

ssl/ssl_locl.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2251,7 +2251,6 @@ __owur int ssl_cipher_id_cmp(const SSL_CIPHER a, const SSL_CIPHER b);
	DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, ssl_cipher_id);		DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, ssl_cipher_id);
	__owur int ssl_cipher_ptr_id_cmp(const SSL_CIPHER const ap,		__owur int ssl_cipher_ptr_id_cmp(const SSL_CIPHER const ap,
	const SSL_CIPHER const bp);		const SSL_CIPHER const bp);
	__owur int set_ciphersuites(STACK_OF(SSL_CIPHER) *currciphers, const char str);
	__owur STACK_OF(SSL_CIPHER) ssl_create_cipher_list(const SSL_METHOD ssl_method,		__owur STACK_OF(SSL_CIPHER) ssl_create_cipher_list(const SSL_METHOD ssl_method,
	STACK_OF(SSL_CIPHER) *tls13_ciphersuites,		STACK_OF(SSL_CIPHER) *tls13_ciphersuites,
	STACK_OF(SSL_CIPHER) **cipher_list,		STACK_OF(SSL_CIPHER) **cipher_list,