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

Cosmetic changes.

Browse Source
This commit is contained in:
Bodo Möller 2000-02-05 21:28:09 +00:00
parent 66430207a4
commit 29a28ee503
7 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/apps.h
View File

@ -65,7 +65,6 @@
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include <openssl/x509.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_load_file(const char *file, BIO *bio_e, int dont_warn);
int app_RAND_write_file(const char *file, BIO *bio_e); int app_RAND_write_file(const char *file, BIO *bio_e);
@ -114,7 +113,7 @@ extern BIO *bio_err;
#define do_pipe_sig() #define do_pipe_sig()
#endif #endif
#if defined(MONOLITH) && !defined(SSLEAY) #if defined(MONOLITH)
# define apps_startup() do_pipe_sig() # define apps_startup() do_pipe_sig()
#else #else
# if defined(MSDOS) || defined(WIN16) || defined(WIN32) # if defined(MSDOS) || defined(WIN16) || defined(WIN32)

5
apps/openssl.c
View File

@ -70,10 +70,9 @@
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/ssl.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 USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
#define SSLEAY_SRC
#include "apps.h" #include "apps.h"
#include "progs.h"
#include "s_apps.h" #include "s_apps.h"
#include <openssl/err.h> #include <openssl/err.h>
@ -374,5 +373,3 @@ static unsigned long MS_CALLBACK hash(FUNCTION *a)
{ {
return(lh_strhash(a->name)); return(lh_strhash(a->name));
} }
#undef SSLEAY

7
apps/progs.h
View File

@ -1,4 +1,5 @@
/* 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 verify_main(int argc,char *argv[]);
extern int asn1parse_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 spkac_main(int argc,char *argv[]);
extern int smime_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_GENERAL 1
#define FUNC_TYPE_MD 2 #define FUNC_TYPE_MD 2
#define FUNC_TYPE_CIPHER 3 #define FUNC_TYPE_CIPHER 3
@ -246,5 +245,3 @@ FUNCTION functions[] = {
#endif #endif
{0,NULL,NULL} {0,NULL,NULL}
}; };
#endif

7
apps/progs.pl
View File

@ -1,6 +1,7 @@
#!/usr/local/bin/perl #!/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); grep(s/^asn1pars$/asn1parse/,@ARGV);
@ -9,8 +10,6 @@ foreach (@ARGV)
print <<'EOF'; print <<'EOF';
#ifdef SSLEAY_SRC /* Defined only in openssl.c. */
#define FUNC_TYPE_GENERAL 1 #define FUNC_TYPE_GENERAL 1
#define FUNC_TYPE_MD 2 #define FUNC_TYPE_MD 2
#define FUNC_TYPE_CIPHER 3 #define FUNC_TYPE_CIPHER 3
@ -76,5 +75,3 @@ foreach (
} }
print "\t{0,NULL,NULL}\n\t};\n"; print "\t{0,NULL,NULL}\n\t};\n";
print "#endif\n\n";

1
crypto/bn/exptest.c
View File

@ -173,6 +173,7 @@ int main(int argc, char *argv[])
BN_free(b); BN_free(b);
BN_free(m); BN_free(m);
BN_CTX_free(ctx); BN_CTX_free(ctx);
ERR_remove_state(0);
CRYPTO_mem_leaks(out); CRYPTO_mem_leaks(out);
BIO_free(out); BIO_free(out);
printf(" done\n"); printf(" done\n");

2
crypto/dsa/dsatest.c
View File

@ -136,6 +136,7 @@ int main(int argc, char **argv)
unsigned char sig[256]; unsigned char sig[256];
unsigned int siglen; unsigned int siglen;
ERR_load_crypto_strings();
RAND_seed(rnd_seed, sizeof rnd_seed); RAND_seed(rnd_seed, sizeof rnd_seed);
if (bio_err == NULL) if (bio_err == NULL)
@ -199,6 +200,7 @@ end:
if (!ret) if (!ret)
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
if (dsa != NULL) DSA_free(dsa); if (dsa != NULL) DSA_free(dsa);
ERR_remove_state(0);
CRYPTO_mem_leaks(bio_err); CRYPTO_mem_leaks(bio_err);
if (bio_err != NULL) if (bio_err != NULL)
{ {

6
crypto/err/err.h
View File

@ -241,9 +241,9 @@ void ERR_print_errors(BIO *bp);
void ERR_add_error_data(int num, ...); void ERR_add_error_data(int num, ...);
#endif #endif
void ERR_load_strings(int lib,ERR_STRING_DATA str[]); void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
void ERR_load_ERR_strings(void ); void ERR_load_ERR_strings(void);
void ERR_load_crypto_strings(void ); void ERR_load_crypto_strings(void);
void ERR_free_strings(void ); void ERR_free_strings(void);
void ERR_remove_state(unsigned long pid); /* if zero we look it up */ void ERR_remove_state(unsigned long pid); /* if zero we look it up */
ERR_STATE *ERR_get_state(void); ERR_STATE *ERR_get_state(void);