Commit 5011589a authored by Matt Caswell's avatar Matt Caswell
Browse files

Move more comments that confuse indent 



Conflicts:
	crypto/dsa/dsa.h
	demos/engines/ibmca/hw_ibmca.c
	ssl/ssl_locl.h

Conflicts:
	crypto/bn/rsaz_exp.c
	crypto/evp/e_aes_cbc_hmac_sha1.c
	crypto/evp/e_aes_cbc_hmac_sha256.c
	ssl/ssl_locl.h

Conflicts:
	crypto/ec/ec2_oct.c
	crypto/ec/ecp_nistp256.c
	crypto/ec/ecp_nistp521.c
	crypto/ec/ecp_nistputil.c
	crypto/ec/ecp_oct.c
	crypto/modes/gcm128.c
	ssl/ssl_locl.h

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

apps/apps.c

+6 −4
Original line number Diff line number Diff line
@@ -110,10 +110,12 @@ 
 */



#if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)

#define _POSIX_C_SOURCE 2	/* On VMS, you need to define this to get

				   the declaration of fileno().  The value

				   2 is to make sure no function defined

				   in POSIX-2 is left undefined. */

/* On VMS, you need to define this to get

 * the declaration of fileno().  The value

 * 2 is to make sure no function defined

 * in POSIX-2 is left undefined.

 */

#define _POSIX_C_SOURCE 2

#endif

#include <stdio.h>

#include <stdlib.h>

apps/ca.c

+2 −1
Original line number Diff line number Diff line
@@ -1474,7 +1474,8 @@ bad: 
			}



		

		if (crlnumberfile != NULL)	/* we have a CRL number that need updating */

		/* we have a CRL number that need updating */

		if (crlnumberfile != NULL)

			if (!save_serial(crlnumberfile,"new",crlnumber,NULL)) goto err;



		if (crlnumber)

apps/passwd.c

+2 −1
Original line number Diff line number Diff line
@@ -310,7 +310,8 @@ err: 
 */

static char *md5crypt(const char *passwd, const char *magic, const char *salt)

	{

	static char out_buf[6 + 9 + 24 + 2]; /* "$apr1$..salt..$.......md5hash..........\0" */

	/* "$apr1$..salt..$.......md5hash..........\0" */

	static char out_buf[6 + 9 + 24 + 2];

	unsigned char buf[MD5_DIGEST_LENGTH];

	char *salt_out;

	int n;

apps/s_apps.h

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ 
 * Hudson (tjh@cryptsoft.com).

 *

 */

#if !defined(OPENSSL_SYS_NETWARE)  /* conflicts with winsock2 stuff on netware */

/* conflicts with winsock2 stuff on netware */

#if !defined(OPENSSL_SYS_NETWARE)

#include <sys/types.h>

#endif

#include <openssl/opensslconf.h>

apps/s_server.c

+2 −1
Original line number Diff line number Diff line
@@ -157,7 +157,8 @@ 
#define APPS_WIN16

#endif



#if !defined(OPENSSL_SYS_NETWARE)  /* conflicts with winsock2 stuff on netware */

/* conflicts with winsock2 stuff on netware */

#if !defined(OPENSSL_SYS_NETWARE)

#include <sys/types.h>

#endif