generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move more comments that confuse indent

Browse Source 
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

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell
2015-01-21 19:18:47 +00:00
parent 4651718410
commit 0f6c965823
31 changed files with 198 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/apps.c
View File

@@ -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>

3
apps/ca.c
View File

@@ -1491,7 +1491,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)

3
apps/passwd.c
View File

@@ -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;

3
apps/s_apps.h
View File

@@ -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>

3
apps/s_server.c
View File

@@ -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