diff options
| author | Bodo Möller <bodo@openssl.org> | 1999-08-02 21:44:49 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 1999-08-02 21:44:49 +0000 |
| commit | a85154416916e2da4ea428112f419db1562bdb58 (patch) | |
| tree | 28c8fe8a89dcece90611c003fb982b54ae8054fd /apps | |
| parent | 2b8e4959fb563f79fcad351a7c66d4d142c0fe8d (diff) | |
avoid some NO_<cipher> problems
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/pkcs12.c | 4 | ||||
| -rw-r--r-- | apps/progs.h | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 351f131fe1..5defddeb32 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -1,4 +1,6 @@ /* pkcs12.c */ +#if !defined(NO_DES) && !defined(NO_SHA1) + /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL * project 1999. */ @@ -697,3 +699,5 @@ void hex_prin(BIO *out, unsigned char *buf, int len) int i; for (i = 0; i < len; i++) BIO_printf (out, "%02X ", buf[i]); } + +#endif diff --git a/apps/progs.h b/apps/progs.h index 0df792e758..df067182bc 100644 --- a/apps/progs.h +++ b/apps/progs.h @@ -86,11 +86,13 @@ FUNCTION functions[] = { {FUNC_TYPE_GENERAL,"pkcs7",pkcs7_main}, {FUNC_TYPE_GENERAL,"crl2pkcs7",crl2pkcs7_main}, {FUNC_TYPE_GENERAL,"sess_id",sess_id_main}, -#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(O_SSL3)) +#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3)) {FUNC_TYPE_GENERAL,"ciphers",ciphers_main}, #endif {FUNC_TYPE_GENERAL,"nseq",nseq_main}, +#if !defined(NO_DES) && !defined(NO_SHA1) {FUNC_TYPE_GENERAL,"pkcs12",pkcs12_main}, +#endif {FUNC_TYPE_GENERAL,"pkcs8",pkcs8_main}, {FUNC_TYPE_MD,"md2",dgst_main}, {FUNC_TYPE_MD,"md5",dgst_main}, |