Commit 3822740c authored by Richard Levitte's avatar Richard Levitte
Browse files

We're getting a clash with C++ because it has a type called 'list'. 

Therefore, change all instances of the symbol 'list' to something else.

PR: 758
Submitted by: Frédéric Giudicelli <groups@newpki.org>
parent 0d78bc33

crypto/conf/conf_mod.c

+2 −2
Original line number Diff line number Diff line
@@ -576,12 +576,12 @@ char *CONF_get1_default_config_file(void) 
 * be used to parse comma separated lists for example.

 */



int CONF_parse_list(const char *list, int sep, int nospc,

int CONF_parse_list(const char *list_, int sep, int nospc,

	int (*list_cb)(const char *elem, int len, void *usr), void *arg)

	{

	int ret;

	const char *lstart, *tmpend, *p;

	lstart = list;

	lstart = list_;



	for(;;)

		{

crypto/engine/eng_fat.c

+3 −3
Original line number Diff line number Diff line
@@ -124,14 +124,14 @@ static int int_def_cb(const char *alg, int len, void *arg) 
	}





int ENGINE_set_default_string(ENGINE *e, const char *list)

int ENGINE_set_default_string(ENGINE *e, const char *def_list)

	{

	unsigned int flags = 0;

	if (!CONF_parse_list(list, ',', 1, int_def_cb, &flags))

	if (!CONF_parse_list(def_list, ',', 1, int_def_cb, &flags))

		{

		ENGINEerr(ENGINE_F_ENGINE_SET_DEFAULT_STRING,

					ENGINE_R_INVALID_STRING);

		ERR_add_error_data(2, "str=",list);

		ERR_add_error_data(2, "str=",def_list);

		return 0;

		}

	return ENGINE_set_default(e, flags);

crypto/engine/engine.h

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ ENGINE *ENGINE_get_digest_engine(int nid); 
 * structure will have had its reference count up'd so the caller

 * should still free their own reference 'e'. */

int ENGINE_set_default_RSA(ENGINE *e);

int ENGINE_set_default_string(ENGINE *e, const char *list);

int ENGINE_set_default_string(ENGINE *e, const char *def_list);

/* Same for the other "methods" */

int ENGINE_set_default_DSA(ENGINE *e);

int ENGINE_set_default_ECDH(ENGINE *e);

ssl/ssl.h

+2 −2
Original line number Diff line number Diff line
@@ -1377,8 +1377,8 @@ const char *SSL_alert_type_string(int value); 
const char *SSL_alert_desc_string_long(int value);

const char *SSL_alert_desc_string(int value);



void SSL_set_client_CA_list(SSL *s, STACK_OF(X509_NAME) *list);

void SSL_CTX_set_client_CA_list(SSL_CTX *ctx, STACK_OF(X509_NAME) *list);

void SSL_set_client_CA_list(SSL *s, STACK_OF(X509_NAME) *name_list);

void SSL_CTX_set_client_CA_list(SSL_CTX *ctx, STACK_OF(X509_NAME) *name_list);

STACK_OF(X509_NAME) *SSL_get_client_CA_list(SSL *s);

STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(SSL_CTX *s);

int SSL_add_client_CA(SSL *ssl,X509 *x);

ssl/ssl_cert.c

+6 −6
Original line number Diff line number Diff line
@@ -534,12 +534,12 @@ int ssl_verify_cert_chain(SSL *s,STACK_OF(X509) *sk) 
	return(i);

	}



static void set_client_CA_list(STACK_OF(X509_NAME) **ca_list,STACK_OF(X509_NAME) *list)

static void set_client_CA_list(STACK_OF(X509_NAME) **ca_list,STACK_OF(X509_NAME) *name_list)

	{

	if (*ca_list != NULL)

		sk_X509_NAME_pop_free(*ca_list,X509_NAME_free);



	*ca_list=list;

	*ca_list=name_list;

	}



STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk)
@@ -561,14 +561,14 @@ STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk) 
	return(ret);

	}



void SSL_set_client_CA_list(SSL *s,STACK_OF(X509_NAME) *list)

void SSL_set_client_CA_list(SSL *s,STACK_OF(X509_NAME) *name_list)

	{

	set_client_CA_list(&(s->client_CA),list);

	set_client_CA_list(&(s->client_CA),name_list);

	}



void SSL_CTX_set_client_CA_list(SSL_CTX *ctx,STACK_OF(X509_NAME) *list)

void SSL_CTX_set_client_CA_list(SSL_CTX *ctx,STACK_OF(X509_NAME) *name_list)

	{

	set_client_CA_list(&(ctx->client_CA),list);

	set_client_CA_list(&(ctx->client_CA),name_list);

	}



STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(SSL_CTX *ctx)