Add forgotten "-passin" option to smime.c usage help.

[oweals/openssl.git] / apps / openssl.c

diff --git a/apps/openssl.c b/apps/openssl.c
index 4ec9606a060d351acf1aeb1c760434b7f7e788dc..4f61006b73bf95bf0bbb11f4709980fd44d044c6 100644 (file)
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -73,15 +73,8 @@
 #include "s_apps.h"
 #include <openssl/err.h>
 
-/* The LHASH callbacks ("hash" & "cmp") have been replaced by functions with the
- * base prototypes (we cast each variable inside the function to the required
- * type of "FUNCTION*"). This removes the necessity for macro-generated wrapper
- * functions. */
-
-/* static unsigned long MS_CALLBACK hash(FUNCTION *a); */
-static unsigned long MS_CALLBACK hash(const void *a_void);
-/* static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b); */
-static int MS_CALLBACK cmp(const void *a_void,const void *b_void);
+static unsigned long MS_CALLBACK hash(FUNCTION *a);
+static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b);
 static LHASH *prog_init(void );
 static int do_cmd(LHASH *prog,int argc,char *argv[]);
 LHASH *config=NULL;
@@ -119,7 +112,6 @@ int main(int Argc, char *Argv[])
                        BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
        ERR_load_crypto_strings();
-       ENGINE_load_builtin_engines();
 
        /* Lets load up our environment a little */
        p=getenv("OPENSSL_CONF");
@@ -358,23 +350,19 @@ static LHASH *prog_init(void)
            ;
        qsort(functions,i,sizeof *functions,SortFnByName);
 
-       if ((ret=lh_new(hash, cmp)) == NULL)
-               return(NULL);
+       if ((ret=lh_new(hash,cmp)) == NULL) return(NULL);
 
        for (f=functions; f->name != NULL; f++)
                lh_insert(ret,f);
        return(ret);
        }
 
-/* static int MS_CALLBACK cmp(FUNCTION *a, FUNCTION *b) */
-static int MS_CALLBACK cmp(const void *a_void, const void *b_void)
+static int MS_CALLBACK cmp(FUNCTION *a, FUNCTION *b)
        {
-       return(strncmp(((FUNCTION *)a_void)->name,
-                       ((FUNCTION *)b_void)->name,8));
+       return(strncmp(a->name,b->name,8));
        }
 
-/* static unsigned long MS_CALLBACK hash(FUNCTION *a) */
-static unsigned long MS_CALLBACK hash(const void *a_void)
+static unsigned long MS_CALLBACK hash(FUNCTION *a)
        {
-       return(lh_strhash(((FUNCTION *)a_void)->name));
+       return(lh_strhash(a->name));
        }