Commit 13270477 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

Conflicts:
	apps/apps.c
	crypto/crypto.h
	crypto/rand/md_rand.c
	ssl/d1_pkt.c
	ssl/ssl.h
	ssl/ssl_locl.h
	ssl/ssltest.c
	ssl/t1_enc.c

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

apps/ca.c

+2 −1
Original line number Diff line number Diff line
@@ -1464,7 +1464,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 (!X509_CRL_sign(crl,pkey,dgst)) goto err;

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
@@ -131,7 +131,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

crypto/bio/bss_bio.c

+2 −1
Original line number Diff line number Diff line
@@ -151,7 +151,8 @@ static int bio_new(BIO *bio) 
		return 0;



	b->peer = NULL;

	b->size = 17*1024; /* enough for one TLS record (just a default) */

	/* enough for one TLS record (just a default) */

	b->size = 17*1024;

	b->buf = NULL;



	bio->ptr = b;