Elide DES_read_password() for no-ui build

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
David Woodhouse 2016-02-21 16:19:44 +00:00 committed by Rich Salz
parent 92d23b339c
commit b9bd7b06cc
2 changed files with 5 additions and 0 deletions

View File

@ -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

View File

@ -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