diff options
| author | Richard Levitte <levitte@openssl.org> | 2001-05-02 09:09:04 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2001-05-02 09:09:04 +0000 |
| commit | 6ef9d8328bd09d3b6a19be83bf46724c806cb1ce (patch) | |
| tree | 69d41b8bec58f00e593b1aa419a3eb378321ff32 /apps | |
| parent | 5a9c441c6e739ef0e3585e7aaa544fdf074a1ad4 (diff) | |
Merge in changes from the 0.9.6-stable branch.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dgst.c | 6 | ||||
| -rw-r--r-- | apps/smime.c | 1 | ||||
| -rw-r--r-- | apps/speed.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/apps/dgst.c b/apps/dgst.c index ab3e2dbb02..61b2a0dc4b 100644 --- a/apps/dgst.c +++ b/apps/dgst.c @@ -74,7 +74,7 @@ #undef PROG #define PROG dgst_main -void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, char binout, +void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout, EVP_PKEY *key, unsigned char *sigin, int siglen); int MAIN(int, char **); @@ -95,7 +95,7 @@ int MAIN(int argc, char **argv) int debug=0; const char *outfile = NULL, *keyfile = NULL; const char *sigfile = NULL, *randfile = NULL; - char out_bin = -1, want_pub = 0, do_verify = 0; + int out_bin = -1, want_pub = 0, do_verify = 0; EVP_PKEY *sigkey = NULL; unsigned char *sigbuf = NULL; int siglen = 0; @@ -365,7 +365,7 @@ end: EXIT(err); } -void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, char binout, +void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout, EVP_PKEY *key, unsigned char *sigin, int siglen) { int len; diff --git a/apps/smime.c b/apps/smime.c index 16b940084b..7bf71ef868 100644 --- a/apps/smime.c +++ b/apps/smime.c @@ -299,6 +299,7 @@ int MAIN(int argc, char **argv) BIO_printf (bio_err, "-CApath dir trusted certificates directory\n"); BIO_printf (bio_err, "-CAfile file trusted certificates file\n"); BIO_printf (bio_err, "-engine e use engine e, possibly a hardware device.\n"); + BIO_printf (bio_err, "-passin arg input file pass phrase source\n"); BIO_printf(bio_err, "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR); BIO_printf(bio_err, " load the file (or the files in the directory) into\n"); BIO_printf(bio_err, " the random number generator\n"); diff --git a/apps/speed.c b/apps/speed.c index 3562ea277b..9c91f718e0 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -83,12 +83,12 @@ #include <openssl/err.h> #include <openssl/engine.h> -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) # define USE_TOD #elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC)) # define TIMES #endif -#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(MPE) +#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(MPE) && !defined(__NetBSD__) # define TIMEB #endif |