Elide DES_read_password() for no-ui build

[openssl.git] / include / openssl / des.h

diff --git a/include/openssl/des.h b/include/openssl/des.h
index 3d784fa03ae556c93929dde7a5dd313abfd21496..13ce23270379889f3db23c4b660502681ce4044c 100644 (file)
--- a/include/openssl/des.h
+++ b/include/openssl/des.h
@@ -58,14 +58,13 @@
 #ifndef HEADER_NEW_DES_H
 # define HEADER_NEW_DES_H
 
-# include <openssl/e_os2.h>     /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG
-                                 * (via openssl/opensslconf.h */
+# include <openssl/e_os2.h>
 
 # ifdef OPENSSL_NO_DES
 #  error DES is disabled.
 # endif
 
-# define DES_LONG OSSL_DES_LONG
+typedef unsigned int DES_LONG;
 
 # ifdef OPENSSL_BUILD_SHLIBCRYPTO
 #  undef OPENSSL_EXTERN
@@ -221,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