Commit 29a28ee5 authored by Bodo Möller's avatar Bodo Möller
Browse files

Cosmetic changes.

parent 66430207

apps/apps.h

+1 −2
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ 
#include <openssl/bio.h>

#include <openssl/crypto.h>

#include <openssl/x509.h>

#include "progs.h"



int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn);

int app_RAND_write_file(const char *file, BIO *bio_e);
@@ -114,7 +113,7 @@ extern BIO *bio_err; 
#define do_pipe_sig()

#endif



#if defined(MONOLITH) && !defined(SSLEAY)

#if defined(MONOLITH)

#  define apps_startup()	do_pipe_sig()

#else

#  if defined(MSDOS) || defined(WIN16) || defined(WIN32)

apps/openssl.c

+1 −4
Original line number Diff line number Diff line
@@ -70,10 +70,9 @@ 
#include <openssl/x509.h>

#include <openssl/pem.h>

#include <openssl/ssl.h>

#define SSLEAY	/* turn off a few special case MONOLITH macros */

#define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */

#define SSLEAY_SRC

#include "apps.h"

#include "progs.h"

#include "s_apps.h"

#include <openssl/err.h>
@@ -374,5 +373,3 @@ static unsigned long MS_CALLBACK hash(FUNCTION *a) 
	{

	return(lh_strhash(a->name));

	}
 


#undef SSLEAY

apps/progs.h

+2 −5
Original line number Diff line number Diff line 
/* This file was generated by progs.pl. */

/* apps/progs.h */

/* automatically generated by progs.pl for openssl.c */



extern int verify_main(int argc,char *argv[]);

extern int asn1parse_main(int argc,char *argv[]);
@@ -32,8 +33,6 @@ extern int pkcs8_main(int argc,char *argv[]); 
extern int spkac_main(int argc,char *argv[]);

extern int smime_main(int argc,char *argv[]);



#ifdef SSLEAY_SRC  /* Defined only in openssl.c. */



#define FUNC_TYPE_GENERAL	1

#define FUNC_TYPE_MD		2

#define FUNC_TYPE_CIPHER	3
@@ -246,5 +245,3 @@ FUNCTION functions[] = { 
#endif

	{0,NULL,NULL}

	};
 
#endif

apps/progs.pl

+2 −5
Original line number Diff line number Diff line 
#!/usr/local/bin/perl



print "/* This file was generated by progs.pl. */\n\n";

print "/* apps/progs.h */\n";

print "/* automatically generated by progs.pl for openssl.c */\n\n";



grep(s/^asn1pars$/asn1parse/,@ARGV);
@@ -9,8 +10,6 @@ foreach (@ARGV) 


print <<'EOF';



#ifdef SSLEAY_SRC  /* Defined only in openssl.c. */



#define FUNC_TYPE_GENERAL	1

#define FUNC_TYPE_MD		2

#define FUNC_TYPE_CIPHER	3
@@ -76,5 +75,3 @@ foreach ( 
	}



print "\t{0,NULL,NULL}\n\t};\n";
 
print "#endif\n\n";

crypto/bn/exptest.c

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ int main(int argc, char *argv[]) 
	BN_free(b);

	BN_free(m);

	BN_CTX_free(ctx);

	ERR_remove_state(0);

	CRYPTO_mem_leaks(out);

	BIO_free(out);

	printf(" done\n");