Commit b9bd7b06 authored by David Woodhouse's avatar David Woodhouse Committed by Rich Salz
Browse files

Elide DES_read_password() for no-ui build 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 92d23b33

crypto/des/read2pwd.c

+3 −0
Original line number Diff line number Diff line
@@ -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

include/openssl/des.h

+2 −0
Original line number Diff line number Diff line
@@ -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