Commit 303c0028 authored by Bodo Möller's avatar Bodo Möller
Browse files

Use "const char *" instead of "char *" for filenames passed to functions. 

Submitted by:
Reviewed by:
PR:
parent a5ab0532

crypto/x509/by_dir.c

+3 −2
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ typedef struct lookup_dir_st 
	int num_dirs_alloced;

	} BY_DIR;



static int dir_ctrl(X509_LOOKUP *ctx,int cmd,char *argp,long argl,char **ret);

static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,

	char **ret);

static int new_dir(X509_LOOKUP *lu);

static void free_dir(X509_LOOKUP *lu);

static int add_cert_dir(BY_DIR *ctx,const char *dir,int type);
@@ -100,7 +101,7 @@ X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void) 
	return(&x509_dir_lookup);

	}



static int dir_ctrl(X509_LOOKUP *ctx, int cmd, char *argp, long argl,

static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,

	     char **retp)

	{

	int ret=0;

crypto/x509/by_file.c

+3 −3
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 


#ifndef NO_STDIO



static int by_file_ctrl(X509_LOOKUP *ctx,int cmd,char *argc,

static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,

	long argl, char **ret);

X509_LOOKUP_METHOD x509_file_lookup=

	{
@@ -91,7 +91,7 @@ X509_LOOKUP_METHOD *X509_LOOKUP_file(void) 
	return(&x509_file_lookup);

	}



static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, char *argp, long argl,

static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,

	     char **ret)

	{

	int ok=0,ok2=0;

crypto/x509/x509_d2.c

+2 −1
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ int X509_STORE_set_default_paths(X509_STORE *ctx) 
	return(1);

	}



int X509_STORE_load_locations(X509_STORE *ctx, char *file, char *path)

int X509_STORE_load_locations(X509_STORE *ctx, const char *file,

		const char *path)

	{

	X509_LOOKUP *lookup;

crypto/x509/x509_lu.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ int X509_LOOKUP_shutdown(X509_LOOKUP *ctx) 
		return(1);

	}



int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, char *argc, long argl,

int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl,

	     char **ret)

	{

	if (ctx->method == NULL) return(-1);

crypto/x509/x509_vfy.h

+5 −3
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ typedef struct x509_lookup_method_st 
	void (*free)(X509_LOOKUP *ctx);

	int (*init)(X509_LOOKUP *ctx);

	int (*shutdown)(X509_LOOKUP *ctx);

	int (*ctrl)(X509_LOOKUP *ctx,int cmd,char *argc,long argl,char **ret);

	int (*ctrl)(X509_LOOKUP *ctx,int cmd,const char *argc,long argl,

			char **ret);

	int (*get_by_subject)(X509_LOOKUP *ctx,int type,X509_NAME *name,

			      X509_OBJECT *ret);

	int (*get_by_issuer_serial)(X509_LOOKUP *ctx,int type,X509_NAME *name,
@@ -281,7 +282,8 @@ int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x); 
int X509_STORE_get_by_subject(X509_STORE_CTX *vs,int type,X509_NAME *name,

	X509_OBJECT *ret);



int X509_LOOKUP_ctrl(X509_LOOKUP *ctx,int cmd,char *argc,long argl,char **ret);

int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,

	long argl, char **ret);



#ifndef NO_STDIO

int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type);
@@ -304,7 +306,7 @@ int X509_LOOKUP_shutdown(X509_LOOKUP *ctx); 


#ifndef NO_STDIO

int	X509_STORE_load_locations (X509_STORE *ctx,

		char *file, char *dir);

		const char *file, const char *dir);

int	X509_STORE_set_default_paths(X509_STORE *ctx);

#endif