Commit 89f6c5b4 authored Jan 05, 2015 by Matt Caswell

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

Reviewed-by: Tim Hudson <tjh@openssl.org>

parent f326f654

apps/ca.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -635,7 +635,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
		@@ -503,7 +503,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
		@@ -220,7 +220,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/b_sock.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -552,7 +552,8 @@ int BIO_socket_ioctl(int fd, long type, void *arg)
		i=ioctlsocket(fd,type,(char *)arg);
		#else
		# if defined(OPENSSL_SYS_VMS)
		/* 2011-02-18 SMS.
		/*-
		* 2011-02-18 SMS.
		* VMS ioctl() can't tolerate a 64-bit "void *arg", but we
		* observe that all the consumers pass in an "unsigned long *",
		* so we arrange a local copy with a short pointer, and use