diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-09-20 13:45:44 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-09-20 13:45:44 +0000 |
| commit | 4cae3ac371e5323c0aecba72807bb7571a600011 (patch) | |
| tree | e5fa005b0158d2a6631be9847cdae92bfb18a737 /apps | |
| parent | 63ccddf7171112bf4811b1591bad70036519097a (diff) | |
| download | openssl-new-4cae3ac371e5323c0aecba72807bb7571a600011.tar.gz | |
Merge of main trunk, all conflicts resolved.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dgst.c | 10 | ||||
| -rw-r--r-- | apps/pkcs12.c | 8 | ||||
| -rw-r--r-- | apps/speed.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/apps/dgst.c b/apps/dgst.c index dbfa387f33..590f8dc4ee 100644 --- a/apps/dgst.c +++ b/apps/dgst.c @@ -75,7 +75,7 @@ #define PROG dgst_main void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, char binout, - EVP_PKEY *key, unsigned char *sigin, unsigned int siglen); + EVP_PKEY *key, unsigned char *sigin, int siglen); int MAIN(int, char **); @@ -98,7 +98,7 @@ int MAIN(int argc, char **argv) char out_bin = -1, want_pub = 0, do_verify = 0; EVP_PKEY *sigkey = NULL; unsigned char *sigbuf = NULL; - unsigned int siglen = 0; + int siglen = 0; char *engine=NULL; apps_startup(); @@ -307,7 +307,7 @@ int MAIN(int argc, char **argv) } siglen = BIO_read(sigbio, sigbuf, siglen); BIO_free(sigbio); - if(siglen == 0) { + if(siglen <= 0) { BIO_printf(bio_err, "Error reading signature file %s\n", sigfile); ERR_print_errors(bio_err); @@ -358,7 +358,7 @@ end: } void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, char binout, - EVP_PKEY *key, unsigned char *sigin, unsigned int siglen) + EVP_PKEY *key, unsigned char *sigin, int siglen) { int len; int i; @@ -372,7 +372,7 @@ void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, char binout, { EVP_MD_CTX *ctx; BIO_get_md_ctx(bp, &ctx); - i = EVP_VerifyFinal(ctx, sigin, siglen, key); + i = EVP_VerifyFinal(ctx, sigin, (unsigned int)siglen, key); if(i > 0) BIO_printf(out, "Verified OK\n"); else if(i == 0) BIO_printf(out, "Verification Failure\n"); else diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 2cc9a0caee..95b2c65e2f 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -903,14 +903,14 @@ int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst, char *name) break; case V_ASN1_OCTET_STRING: - hex_prin(out, av->value.bit_string->data, - av->value.bit_string->length); + hex_prin(out, av->value.octet_string->data, + av->value.octet_string->length); BIO_printf(out, "\n"); break; case V_ASN1_BIT_STRING: - hex_prin(out, av->value.octet_string->data, - av->value.octet_string->length); + hex_prin(out, av->value.bit_string->data, + av->value.bit_string->length); BIO_printf(out, "\n"); break; diff --git a/apps/speed.c b/apps/speed.c index f4aa784670..dfaa506bb1 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -88,7 +88,7 @@ #elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC)) # define TIMES #endif -#if !defined(_UNICOS) && !defined(__OpenBSD__) +#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) # define TIMEB #endif |