diff options
author | Richard Levitte <levitte@openssl.org> | 2018-08-13 07:11:47 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2018-09-03 13:10:17 +0200 |
commit | 64a48fc7f0bc2d3ff587791b93a357bd98e1a5b8 (patch) | |
tree | a04042a873834b30799b42f08923f0ca904ebab2 /ssl | |
parent | 6ad952ba75ccf183da18939e70e7aa91f0b7f5b6 (diff) | |
download | openssl-64a48fc7f0bc2d3ff587791b93a357bd98e1a5b8.tar.gz |
Rename SSL[_CTX]_add1_CA_list -> SSL[_CTX]_add1_to_CA_list
They add a single item, so the names give a false impression of what
they do, making them hard to remember. Better to give them a somewhat
better name.
Fixes #6930
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6931)
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/ssl_cert.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index e740a8c25d..52a4a7eaad 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -545,16 +545,20 @@ static int add_ca_name(STACK_OF(X509_NAME) **sk, const X509 *x) return 1; } -int SSL_add1_CA_list(SSL *ssl, const X509 *x) +int SSL_add1_to_CA_list(SSL *ssl, const X509 *x) { return add_ca_name(&ssl->ca_names, x); } -int SSL_CTX_add1_CA_list(SSL_CTX *ctx, const X509 *x) +int SSL_CTX_add1_to_CA_list(SSL_CTX *ctx, const X509 *x) { return add_ca_name(&ctx->ca_names, x); } +/* + * The following two are older names are to be replaced with + * SSL(_CTX)_add1_to_CA_list + */ int SSL_add_client_CA(SSL *ssl, X509 *x) { return add_ca_name(&ssl->ca_names, x); |