Commit e778802f authored by Ben Laurie's avatar Ben Laurie
Browse files

Massive constification.

parent d77b3054
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@

 Changes between 0.9.2b and 0.9.3

  *) A lot of constification, and fix a bug in X509_NAME_oneline() that could
     return a const string when you are expecting an allocated buffer.
     [Ben Laurie]

  *) Add support for ASN1 types UTF8String and VISIBLESTRING.
     [Steve Henson]

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ my %table=(
"purify",	"purify gcc:-g -DPURIFY -Wall:-lsocket -lnsl::::",
"debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:-lefence::::",
"debug-ben",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -O2 -Wall -Wshadow -Werror -pipe:::::",
"debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe:::::",
"debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe:::::",
"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
"dist",		"cc:-O -DNOPROTO::::",

+15 −12
Original line number Diff line number Diff line
@@ -168,17 +168,20 @@ static int index_name_cmp(char **a,char **b);
static BIGNUM *load_serial(char *serialfile);
static int save_serial(char *serialfile, BIGNUM *serial);
static int certify(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
	EVP_MD *dgst,STACK *policy,TXT_DB *db,BIGNUM *serial,char *startdate,
	int days, int batch, char *ext_sect, LHASH *conf,int verbose);
		   const EVP_MD *dgst,STACK *policy,TXT_DB *db,BIGNUM *serial,
		   char *startdate,int days,int batch,char *ext_sect,
		   LHASH *conf,int verbose);
static int certify_cert(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
	EVP_MD *dgst,STACK *policy,TXT_DB *db,BIGNUM *serial,char *startdate,
	int days,int batch,char *ext_sect, LHASH *conf,int verbose);
			const EVP_MD *dgst,STACK *policy,TXT_DB *db,
			BIGNUM *serial,char *startdate,int days,int batch,
			char *ext_sect, LHASH *conf,int verbose);
static int certify_spkac(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
	EVP_MD *dgst,STACK *policy,TXT_DB *db,BIGNUM *serial,char *startdate,
	int days,char *ext_sect,LHASH *conf,int verbose);
			 const EVP_MD *dgst,STACK *policy,TXT_DB *db,
			 BIGNUM *serial,char *startdate,int days,
			 char *ext_sect,LHASH *conf,int verbose);
static int fix_data(int nid, int *type);
static void write_new_certificate(BIO *bp, X509 *x, int output_der);
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, EVP_MD *dgst,
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
	STACK *policy, TXT_DB *db, BIGNUM *serial, char *startdate,
	int days, int batch, int verbose, X509_REQ *req, char *ext_sect,
	LHASH *conf);
@@ -257,7 +260,7 @@ char **argv;
	char **pp,*p,*f;
	int i,j;
	long l;
	EVP_MD *dgst=NULL;
	const EVP_MD *dgst=NULL;
	STACK *attribs=NULL;
	STACK *cert_sk=NULL;
	BIO *hex=NULL;
@@ -1303,7 +1306,7 @@ X509 **xret;
char *infile;
EVP_PKEY *pkey;
X509 *x509;
EVP_MD *dgst;
const EVP_MD *dgst;
STACK *policy;
TXT_DB *db;
BIGNUM *serial;
@@ -1374,7 +1377,7 @@ X509 **xret;
char *infile;
EVP_PKEY *pkey;
X509 *x509;
EVP_MD *dgst;
const EVP_MD *dgst;
STACK *policy;
TXT_DB *db;
BIGNUM *serial;
@@ -1448,7 +1451,7 @@ static int do_body(xret,pkey,x509,dgst,policy,db,serial,startdate,days,
X509 **xret;
EVP_PKEY *pkey;
X509 *x509;
EVP_MD *dgst;
const EVP_MD *dgst;
STACK *policy;
TXT_DB *db;
BIGNUM *serial;
@@ -1921,7 +1924,7 @@ X509 **xret;
char *infile;
EVP_PKEY *pkey;
X509 *x509;
EVP_MD *dgst;
const EVP_MD *dgst;
STACK *policy;
TXT_DB *db;
BIGNUM *serial;
+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ char **argv;
	{
	int ret=1,i;
	int verbose=0;
	char **pp,*p;
	char **pp;
	const char *p;
	int badops=0;
	SSL_CTX *ctx=NULL;
	SSL *ssl=NULL;
+2 −2
Original line number Diff line number Diff line
@@ -85,10 +85,10 @@ char **argv;
	{
	unsigned char *buf=NULL;
	int i,err=0;
	EVP_MD *md=NULL,*m;
	const EVP_MD *md=NULL,*m;
	BIO *in=NULL,*inp;
	BIO *bmd=NULL;
	char *name;
	const char *name;
#define PROG_NAME_SIZE  16
        char pname[PROG_NAME_SIZE];
	int separator=0;
Loading