diff options
| author | nectar <nectar@FreeBSD.org> | 2003-02-19 23:17:42 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2003-02-19 23:17:42 +0000 |
| commit | 6c9986c446b6cf77f5e83d111dbcca682d6fdd71 (patch) | |
| tree | e5eb3878430323e978956db174c9c51c7997ba4a /crypto/openssl/apps/spkac.c | |
| parent | b6c07e9a21ba42613fc3906d3efb586dd5c9a846 (diff) | |
| download | FreeBSD-src-6c9986c446b6cf77f5e83d111dbcca682d6fdd71.zip FreeBSD-src-6c9986c446b6cf77f5e83d111dbcca682d6fdd71.tar.gz | |
Vendor import of OpenSSL 0.9.7a.
Diffstat (limited to 'crypto/openssl/apps/spkac.c')
| -rw-r--r-- | crypto/openssl/apps/spkac.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/crypto/openssl/apps/spkac.c b/crypto/openssl/apps/spkac.c index ed370c5..47ee53f 100644 --- a/crypto/openssl/apps/spkac.c +++ b/crypto/openssl/apps/spkac.c @@ -92,7 +92,9 @@ int MAIN(int argc, char **argv) CONF *conf = NULL; NETSCAPE_SPKI *spki = NULL; EVP_PKEY *pkey = NULL; +#ifndef OPENSSL_NO_ENGINE char *engine=NULL; +#endif apps_startup(); @@ -141,11 +143,13 @@ int MAIN(int argc, char **argv) if (--argc < 1) goto bad; spksect= *(++argv); } +#ifndef OPENSSL_NO_ENGINE else if (strcmp(*argv,"-engine") == 0) { if (--argc < 1) goto bad; engine= *(++argv); } +#endif else if (strcmp(*argv,"-noout") == 0) noout=1; else if (strcmp(*argv,"-pubkey") == 0) @@ -171,7 +175,9 @@ bad: BIO_printf(bio_err," -noout don't print SPKAC\n"); BIO_printf(bio_err," -pubkey output public key\n"); BIO_printf(bio_err," -verify verify SPKAC signature\n"); +#ifndef OPENSSL_NO_ENGINE BIO_printf(bio_err," -engine e use engine e, possibly a hardware device.\n"); +#endif goto end; } @@ -181,7 +187,9 @@ bad: goto end; } +#ifndef OPENSSL_NO_ENGINE e = setup_engine(bio_err, engine, 0); +#endif if(keyfile) { pkey = load_key(bio_err, |
