Commit 9dd5ae65 authored by Ben Laurie's avatar Ben Laurie
Browse files

Constification, add config to /dev/crypto.

parent e1e87607

Configure

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ my %table=( 
"debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror::(unknown)::-lefence::::",

"debug-ben",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::asm/bn86-elf.o asm/co86-elf.o",

"debug-ben-openbsd","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",

"debug-ben-openbsd-debug","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",

"debug-ben-debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::::",

"debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown)::::::",

"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",

crypto/aes/Makefile.ssl

+9 −5
Original line number Diff line number Diff line
@@ -85,8 +85,12 @@ clean: 


# DO NOT DELETE THIS LINE -- make depend depends on it.



aes_cbc.o: ../../include/openssl/aes.h aes_cbc.c aes_locl.h

aes_core.o: ../../include/openssl/aes.h aes_core.c aes_locl.h

aes_ecb.o: ../../include/openssl/aes.h aes_ecb.c aes_locl.h

aes_misc.o: ../../include/openssl/aes.h ../../include/openssl/opensslv.h

aes_misc.o: aes_locl.h aes_misc.c
 
aes_cbc.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h

aes_cbc.o: ../../include/openssl/opensslconf.h aes_cbc.c aes_locl.h

aes_core.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h

aes_core.o: ../../include/openssl/opensslconf.h aes_core.c aes_locl.h

aes_ecb.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h

aes_ecb.o: ../../include/openssl/opensslconf.h aes_ecb.c aes_locl.h

aes_misc.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h

aes_misc.o: ../../include/openssl/opensslconf.h

aes_misc.o: ../../include/openssl/opensslv.h aes_locl.h aes_misc.c

crypto/asn1/Makefile.ssl

+15 −0
Original line number Diff line number Diff line
@@ -363,6 +363,21 @@ asn1_par.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h 
asn1_par.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

asn1_par.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

asn1_par.o: ../../include/openssl/symhacks.h ../cryptlib.h asn1_par.c

asn_moid.o: ../../e_os.h ../../include/openssl/asn1.h

asn_moid.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

asn_moid.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h

asn_moid.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h

asn_moid.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h

asn_moid.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

asn_moid.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h

asn_moid.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

asn_moid.o: ../../include/openssl/opensslconf.h

asn_moid.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

asn_moid.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h

asn_moid.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

asn_moid.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

asn_moid.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

asn_moid.o: ../cryptlib.h asn_moid.c

asn_pack.o: ../../e_os.h ../../include/openssl/asn1.h

asn_pack.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

asn_pack.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

crypto/asn1/asn_moid.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
/* Simple ASN1 OID module: add all objects in a given section */



/* NOTE: doesn't do anything other than print debug messages yet... */

static int oid_module_init(CONF_IMODULE *md, CONF *cnf)

static int oid_module_init(CONF_IMODULE *md, const CONF *cnf)

	{

	fprintf(stderr, "Called oid_module_init: name %s, value %s\n",

			CONF_imodule_get_name(md), CONF_imodule_get_value(md));

crypto/conf/conf.h

+22 −19
Original line number Diff line number Diff line
@@ -93,9 +93,9 @@ struct conf_method_st 
	int (*destroy)(CONF *conf);

	int (*destroy_data)(CONF *conf);

	int (*load_bio)(CONF *conf, BIO *bp, long *eline);

	int (*dump)(CONF *conf, BIO *bp);

	int (*is_number)(CONF *conf, char c);

	int (*to_int)(CONF *conf, char c);

	int (*dump)(const CONF *conf, BIO *bp);

	int (*is_number)(const CONF *conf, char c);

	int (*to_int)(const CONF *conf, char c);

	int (*load)(CONF *conf, const char *name, long *eline);

	};
@@ -105,7 +105,7 @@ typedef struct conf_imodule_st CONF_IMODULE; 
typedef struct conf_module_st CONF_MODULE;



/* DSO module function typedefs */

typedef int conf_init_func(CONF_IMODULE *md, CONF *cnf);

typedef int conf_init_func(CONF_IMODULE *md, const CONF *cnf);

typedef void conf_finish_func(CONF_IMODULE *md);



#define	CONF_MFLAGS_IGNORE_ERRORS	0x1
@@ -120,9 +120,9 @@ LHASH *CONF_load(LHASH *conf,const char *file,long *eline); 
LHASH *CONF_load_fp(LHASH *conf, FILE *fp,long *eline);

#endif

LHASH *CONF_load_bio(LHASH *conf, BIO *bp,long *eline);

STACK_OF(CONF_VALUE) *CONF_get_section(LHASH *conf,char *section);

char *CONF_get_string(LHASH *conf,char *group,char *name);

long CONF_get_number(LHASH *conf,char *group,char *name);

STACK_OF(CONF_VALUE) *CONF_get_section(LHASH *conf,const char *section);

char *CONF_get_string(LHASH *conf,const char *group,const char *name);

long CONF_get_number(LHASH *conf,const char *group,const char *name);

void CONF_free(LHASH *conf);

int CONF_dump_fp(LHASH *conf, FILE *out);

int CONF_dump_bio(LHASH *conf, BIO *out);
@@ -153,11 +153,12 @@ int NCONF_load(CONF *conf,const char *file,long *eline); 
int NCONF_load_fp(CONF *conf, FILE *fp,long *eline);

#endif

int NCONF_load_bio(CONF *conf, BIO *bp,long *eline);

STACK_OF(CONF_VALUE) *NCONF_get_section(CONF *conf,char *section);

char *NCONF_get_string(CONF *conf,char *group,char *name);

int NCONF_get_number_e(CONF *conf,char *group,char *name,long *result);

int NCONF_dump_fp(CONF *conf, FILE *out);

int NCONF_dump_bio(CONF *conf, BIO *out);

STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf,const char *section);

char *NCONF_get_string(const CONF *conf,const char *group,const char *name);

int NCONF_get_number_e(const CONF *conf,const char *group,const char *name,

		       long *result);

int NCONF_dump_fp(const CONF *conf, FILE *out);

int NCONF_dump_bio(const CONF *conf, BIO *out);



#if 0 /* The following function has no error checking,

	 and should therefore be avoided */
@@ -168,19 +169,21 @@ long NCONF_get_number(CONF *conf,char *group,char *name); 
  

/* Module functions */



int CONF_modules_load(CONF *cnf, char *appname, unsigned long flags);

int CONF_modules_load_file(char *filename, char *appname, unsigned long flags);

int CONF_modules_load(const CONF *cnf, const char *appname,

		      unsigned long flags);

int CONF_modules_load_file(const char *filename, const char *appname,

			   unsigned long flags);

void CONF_modules_unload(int all);

void CONF_modules_finish(void);

int CONF_module_add(const char *name, conf_init_func *ifunc,

		    conf_finish_func *ffunc);



char *CONF_imodule_get_name(CONF_IMODULE *md);

char *CONF_imodule_get_value(CONF_IMODULE *md);

void *CONF_imodule_get_usr_data(CONF_IMODULE *md);

const char *CONF_imodule_get_name(const CONF_IMODULE *md);

const char *CONF_imodule_get_value(const CONF_IMODULE *md);

void *CONF_imodule_get_usr_data(const CONF_IMODULE *md);

void CONF_imodule_set_usr_data(CONF_IMODULE *md, void *usr_data);

CONF_MODULE *CONF_imodule_get_module(CONF_IMODULE *md);

unsigned long CONF_imodule_get_flags(CONF_IMODULE *md);

CONF_MODULE *CONF_imodule_get_module(const CONF_IMODULE *md);

unsigned long CONF_imodule_get_flags(const CONF_IMODULE *md);

void CONF_imodule_set_flags(CONF_IMODULE *md, unsigned long flags);

void *CONF_module_get_usr_data(CONF_MODULE *pmod);

void CONF_module_set_usr_data(CONF_MODULE *pmod, void *usr_data);