Commit 564ccc55 authored by Matt Caswell's avatar Matt Caswell
Browse files

Further comment amendments to preserve formatting prior to source reformat 



(cherry picked from commit 4a7fa26ffd65bf36beb8d1cb8f29fc0ae203f5c5)

Conflicts:
	crypto/x509v3/pcy_tree.c

Conflicts:
	apps/apps.c
	ssl/ssltest.c

Conflicts:
	apps/apps.c
	crypto/ec/ec2_oct.c
	crypto/ec/ecp_nistp224.c
	crypto/ec/ecp_nistp256.c
	crypto/ec/ecp_nistp521.c
	ssl/s3_cbc.c
	ssl/ssl_sess.c
	ssl/t1_lib.c

Conflicts:
	crypto/bio/b_sock.c
	crypto/pem/pem.h
	crypto/x509/x509_vfy.c
	crypto/x509v3/pcy_tree.c
	ssl/s3_both.c

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent b558c8d5

apps/ca.c

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ bad: 
			oid_bio=BIO_new_file(p,"r");

			if (oid_bio == NULL) 

				{

				/*

				/*-

				BIO_printf(bio_err,"problems opening %s for extra oid's\n",p);

				ERR_print_errors(bio_err);

				*/

apps/pkcs7.c

+2 −1
Original line number Diff line number Diff line
@@ -71,7 +71,8 @@ 
#undef PROG

#define PROG	pkcs7_main



/* -inform arg	- input format - default PEM (DER or PEM)

/*-

 * -inform arg	- input format - default PEM (DER or PEM)

 * -outform arg - output format - default PEM

 * -in arg	- input file - default stdin

 * -out arg	- output file - default stdout

apps/req.c

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ bad: 
			oid_bio=BIO_new_file(p,"r");

			if (oid_bio == NULL) 

				{

				/*

				/*-

				BIO_printf(bio_err,"problems opening %s for extra oid's\n",p);

				ERR_print_errors(bio_err);

				*/

apps/s_cb.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file) 
			return(0);

			}



		/*

		/*-

		In theory this is no longer needed 

		ssl=SSL_new(ctx);

		x509=SSL_get_certificate(ssl);

crypto/bio/bf_null.c

+4 −2
Original line number Diff line number Diff line
@@ -102,9 +102,11 @@ static int nullf_new(BIO *bi) 
static int nullf_free(BIO *a)

	{

	if (a == NULL) return(0);

/*	a->ptr=NULL;

	/*-

  	a->ptr=NULL;

	a->init=0;

	a->flags=0;*/

	a->flags=0;

	*/

	return(1);

	}