Commit 8b79f205 authored by Richard Levitte's avatar Richard Levitte
Browse files

Recent and not so recent changes from 0.9.7-stable, all conflicts resolved.

parent 79956270

apps/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ tags: 
tests:



links:

	@$(TOP)/util/point.sh Makefile.ssl Makefile

	@sh $(TOP)/util/point.sh Makefile.ssl Makefile



lint:

	lint -DLINT $(INCLUDES) $(SRC)>fluff

apps/apps.c

+6 −4
Original line number Diff line number Diff line
@@ -1385,14 +1385,16 @@ int load_config(BIO *err, CONF *cnf) 
char *make_config_name()

	{

	const char *t=X509_get_default_cert_area();

	size_t len;

	char *p;



	p=OPENSSL_malloc(strlen(t)+strlen(OPENSSL_CONF)+2);

	strcpy(p,t);

	len=strlen(t)+strlen(OPENSSL_CONF)+2;

	p=OPENSSL_malloc(len);

	BUF_strlcpy(p,t,len);

#ifndef OPENSSL_SYS_VMS

	strcat(p,"/");

	BUF_strlcat(p,"/",len);

#endif

	strcat(p,OPENSSL_CONF);

	BUF_strlcat(p,OPENSSL_CONF,len);



	return p;

	}

apps/ca.c

+29 −22
Original line number Diff line number Diff line
@@ -569,16 +569,19 @@ bad: 
	if (configfile == NULL)

		{

		const char *s=X509_get_default_cert_area();

		size_t len;



#ifdef OPENSSL_SYS_VMS

		tofree=OPENSSL_malloc(strlen(s)+sizeof(CONFIG_FILE));

		len = strlen(s)+sizeof(CONFIG_FILE);

		tofree=OPENSSL_malloc(len);

		strcpy(tofree,s);

#else

		tofree=OPENSSL_malloc(strlen(s)+sizeof(CONFIG_FILE)+1);

		strcpy(tofree,s);

		strcat(tofree,"/");

		len = strlen(s)+sizeof(CONFIG_FILE)+1;

		tofree=OPENSSL_malloc(len);

		BUF_strlcpy(tofree,s,len);

		BUF_strlcat(tofree,"/",len);

#endif

		strcat(tofree,CONFIG_FILE);

		BUF_strlcat(tofree,CONFIG_FILE,len);

		configfile=tofree;

		}
@@ -1302,7 +1305,7 @@ bad: 
#ifdef OPENSSL_SYS_VMS

			strcat(buf[0],"-new");

#else

			strcat(buf[0],".new");

			BUF_strlcat(buf[0],".new",sizeof(buf[0]));

#endif



			if (!save_serial(buf[0],serial)) goto err;
@@ -1312,7 +1315,7 @@ bad: 
#ifdef OPENSSL_SYS_VMS

			strcat(buf[1],"-new");

#else

			strcat(buf[1],".new");

			BUF_strlcat(buf[1],".new",sizeof(buf[1]));

#endif



			if (BIO_write_filename(out,buf[1]) <= 0)
@@ -1330,7 +1333,7 @@ bad: 
		for (i=0; i<sk_X509_num(cert_sk); i++)

			{

			int k;

			unsigned char *n;

			char *n;



			x=sk_X509_value(cert_sk,i);
@@ -1346,15 +1349,19 @@ bad: 
			strcpy(buf[2],outdir);



#ifndef OPENSSL_SYS_VMS

			strcat(buf[2],"/");

			BUF_strlcat(buf[2],"/",sizeof(buf[2]));

#endif



			n=(unsigned char *)&(buf[2][strlen(buf[2])]);

			n=(char *)&(buf[2][strlen(buf[2])]);

			if (j > 0)

				{

				for (k=0; k<j; k++)

					{

					sprintf((char *)n,"%02X",(unsigned char)*(p++));

					if (n >= &(buf[2][sizeof(buf[2])]))

						break;

					BIO_snprintf(n,

						     &buf[2][0] + sizeof(buf[2]) - n,

						     "%02X",(unsigned char)*(p++));

					n+=2;

					}

				}
@@ -1386,7 +1393,7 @@ bad: 
#ifdef OPENSSL_SYS_VMS

			strcat(buf[2],"-old");

#else

			strcat(buf[2],".old");

			BUF_strlcat(buf[2],".old",sizeof(buf[2]));

#endif



			BIO_free(in);
@@ -1415,7 +1422,7 @@ bad: 
#ifdef OPENSSL_SYS_VMS

			strcat(buf[2],"-old");

#else

			strcat(buf[2],".old");

			BUF_strlcat(buf[2],".old",sizeof(buf[2]));

#endif



			if (rename(dbfile,buf[2]) < 0)
@@ -1585,7 +1592,7 @@ bad: 


			strcpy(buf[0],dbfile);

#ifndef OPENSSL_SYS_VMS

			strcat(buf[0],".new");

			BUF_strlcat(buf[0],".new",sizeof(buf[0]));

#else

			strcat(buf[0],"-new");

#endif
@@ -1604,7 +1611,7 @@ bad: 
			strncpy(buf[1],dbfile,BSIZE-4);

			buf[1][BSIZE-4]='\0';

#ifndef OPENSSL_SYS_VMS

			strcat(buf[1],".old");

			BUF_strlcat(buf[1],".old",sizeof(buf[1]));

#else

			strcat(buf[1],"-old");

#endif
@@ -2342,7 +2349,7 @@ again2: 
		BIO_printf(bio_err,"Memory allocation failure\n");

		goto err;

		}

	strcpy(row[DB_file],"unknown");

	BUF_strlcpy(row[DB_file],"unknown",8);

	row[DB_type][0]='V';

	row[DB_type][1]='\0';
@@ -2643,7 +2650,7 @@ static int do_revoke(X509 *x509, TXT_DB *db, int type, char *value) 
			BIO_printf(bio_err,"Memory allocation failure\n");

			goto err;

			}

		strcpy(row[DB_file],"unknown");

		BUF_strlcpy(row[DB_file],"unknown",8);

		row[DB_type][0]='V';

		row[DB_type][1]='\0';
@@ -2967,16 +2974,16 @@ char *make_revocation_str(int rev_type, char *rev_arg) 


	if (!str) return NULL;



	strcpy(str, (char *)revtm->data);

	BUF_strlcpy(str, (char *)revtm->data, i);

	if (reason)

		{

		strcat(str, ",");

		strcat(str, reason);

		BUF_strlcat(str, ",", i);

		BUF_strlcat(str, reason, i);

		}

	if (other)

		{

		strcat(str, ",");

		strcat(str, other);

		BUF_strlcat(str, ",", i);

		BUF_strlcat(str, other, i);

		}

	ASN1_UTCTIME_free(revtm);

	return str;

apps/dgst.c

+3 −2
Original line number Diff line number Diff line
@@ -347,8 +347,9 @@ int MAIN(int argc, char **argv) 
				}

			if(!out_bin)

				{

				tmp=tofree=OPENSSL_malloc(strlen(name)+strlen(argv[i])+5);

				sprintf(tmp,"%s(%s)= ",name,argv[i]);

				size_t len = strlen(name)+strlen(argv[i])+5;

				tmp=tofree=OPENSSL_malloc(len);

				BIO_snprintf(tmp,len,"%s(%s)= ",name,argv[i]);

				}

			else

				tmp="";

apps/enc.c

+3 −3
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ bad: 
			{

			char buf[200];



			sprintf(buf,"enter %s %s password:",

			BIO_snprintf(buf,sizeof buf,"enter %s %s password:",

				     OBJ_nid2ln(EVP_CIPHER_nid(cipher)),

				     (enc)?"encryption":"decryption");

			strbuf[0]='\0';