diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2016-02-21 16:19:44 +0000 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-07 14:51:08 -0500 |
| commit | b9bd7b06cc409e96ceb7606a79a7f5900aa696fe (patch) | |
| tree | 0c445d503afdce7db35bc4937d058e4d031afdc2 | |
| parent | 92d23b339c631bca2cf12a47e05f13772f9868a0 (diff) | |
| download | openssl-b9bd7b06cc409e96ceb7606a79a7f5900aa696fe.tar.gz | |
Elide DES_read_password() for no-ui build
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rw-r--r-- | crypto/des/read2pwd.c | 3 | ||||
| -rw-r--r-- | include/openssl/des.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/crypto/des/read2pwd.c b/crypto/des/read2pwd.c index db31adb526..748d0e621b 100644 --- a/crypto/des/read2pwd.c +++ b/crypto/des/read2pwd.c @@ -113,6 +113,8 @@ #include <openssl/ui.h> #include <openssl/crypto.h> +#ifndef OPENSSL_NO_UI + #ifndef BUFSIZ #define BUFSIZ 256 #endif @@ -141,3 +143,4 @@ int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2, OPENSSL_cleanse(buff, BUFSIZ); return (ok); } +#endif diff --git a/include/openssl/des.h b/include/openssl/des.h index 649bc792ee..13ce232703 100644 --- a/include/openssl/des.h +++ b/include/openssl/des.h @@ -220,9 +220,11 @@ void DES_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length, DES_key_schedule *schedule, DES_cblock *ivec, int *num); +#ifndef OPENSSL_NO_UI int DES_read_password(DES_cblock *key, const char *prompt, int verify); int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2, const char *prompt, int verify); +#endif # define DES_fixup_key_parity DES_set_odd_parity |