diff options
Diffstat (limited to 'crypto/openssl/apps/openssl.c')
-rw-r--r-- | crypto/openssl/apps/openssl.c | 59 |
1 files changed, 20 insertions, 39 deletions
diff --git a/crypto/openssl/apps/openssl.c b/crypto/openssl/apps/openssl.c index 9a337fb..a2a2630 100644 --- a/crypto/openssl/apps/openssl.c +++ b/crypto/openssl/apps/openssl.c @@ -56,13 +56,10 @@ * [including the GNU Public Licence.] */ -#ifndef DEBUG -#undef DEBUG -#endif - #include <stdio.h> #include <string.h> #include <stdlib.h> +#define OPENSSL_C /* tells apps.h to use complete apps_startup() */ #include <openssl/bio.h> #include <openssl/crypto.h> #include <openssl/lhash.h> @@ -70,19 +67,12 @@ #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> -/* -#ifdef WINDOWS -#include "bss_file.c" -#endif -*/ - static unsigned long MS_CALLBACK hash(FUNCTION *a); static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b); static LHASH *prog_init(void ); @@ -90,15 +80,6 @@ static int do_cmd(LHASH *prog,int argc,char *argv[]); LHASH *config=NULL; char *default_config_file=NULL; -#ifdef DEBUG -static void sig_stop(int i) - { - char *a=NULL; - - *a='\0'; - } -#endif - /* Make sure there is only one when MONOLITH is defined */ #ifdef MONOLITH BIO *bio_err=NULL; @@ -120,24 +101,14 @@ int main(int Argc, char *Argv[]) arg.data=NULL; arg.count=0; - /* SSLeay_add_ssl_algorithms(); is called in apps_startup() */ - apps_startup(); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); -#if defined(DEBUG) && !defined(WINDOWS) && !defined(MSDOS) -#ifdef SIGBUS - signal(SIGBUS,sig_stop); -#endif -#ifdef SIGSEGV - signal(SIGSEGV,sig_stop); -#endif -#endif + apps_startup(); if (bio_err == NULL) if ((bio_err=BIO_new(BIO_s_file())) != NULL) BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT); - CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); - ERR_load_crypto_strings(); /* Lets load up our environment a little */ @@ -165,7 +136,7 @@ int main(int Argc, char *Argv[]) program_name(Argv[0],pname,PROG_NAME_SIZE); f.name=pname; - fp=(FUNCTION *)lh_retrieve(prog,(char *)&f); + fp=(FUNCTION *)lh_retrieve(prog,&f); if (fp != NULL) { Argv[0]=pname; @@ -235,7 +206,7 @@ end: EVP_cleanup(); ERR_free_strings(); - + CRYPTO_mem_leaks(bio_err); if (bio_err != NULL) { @@ -257,11 +228,23 @@ static int do_cmd(LHASH *prog, int argc, char *argv[]) if ((argc <= 0) || (argv[0] == NULL)) { ret=0; goto end; } f.name=argv[0]; - fp=(FUNCTION *)lh_retrieve(prog,(char *)&f); + fp=(FUNCTION *)lh_retrieve(prog,&f); if (fp != NULL) { ret=fp->func(argc,argv); } + else if ((strncmp(argv[0],"no-",3)) == 0) + { + BIO *bio_stdout = BIO_new_fp(stdout,BIO_NOCLOSE); + f.name=argv[0]+3; + ret = (lh_retrieve(prog,&f) != NULL); + if (!ret) + BIO_printf(bio_stdout, "%s\n", argv[0]); + else + BIO_printf(bio_stdout, "%s\n", argv[0]+3); + BIO_free(bio_stdout); + goto end; + } else if ((strcmp(argv[0],"quit") == 0) || (strcmp(argv[0],"q") == 0) || (strcmp(argv[0],"exit") == 0) || @@ -356,7 +339,7 @@ static LHASH *prog_init(void) if ((ret=lh_new(hash,cmp)) == NULL) return(NULL); for (f=functions; f->name != NULL; f++) - lh_insert(ret,(char *)f); + lh_insert(ret,f); return(ret); } @@ -369,5 +352,3 @@ static unsigned long MS_CALLBACK hash(FUNCTION *a) { return(lh_strhash(a->name)); } - -#undef SSLEAY |