Commit 299053be authored by Richard Levitte's avatar Richard Levitte
Browse files

des_read_password() and des_read_2passwords() can only appear if DES 

is compiled.
parent 1449bda0

crypto/ui/ui_compat.c

+3 −2
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ 
 * [including the GNU Public Licence.]

 */



#include <openssl/des.h>

#include <openssl/ui.h>

#include <openssl/ui_compat.h>



#ifndef OPENSSL_NO_DES

int des_read_password(des_cblock *key, const char *prompt, int verify)

	{

	int ok;
@@ -84,6 +84,7 @@ int des_read_2passwords(des_cblock *key1, des_cblock *key2, const char *prompt, 
	memset(buff,0,BUFSIZ);

	return(ok);

	}

#endif



int des_read_pw_string(char *buf,int length,const char *prompt,int verify)

	{

crypto/ui/ui_compat.h

+6 −0
Original line number Diff line number Diff line
@@ -59,7 +59,11 @@ 
#ifndef HEADER_UI_COMPAT_H

#define HEADER_UI_COMPAT_H



#include <openssl/opensslconf.h>

#include <openssl/ui.h>

#ifndef OPENSSL_NO_DES

#include <openssl/des.h>

#endif



#ifdef  __cplusplus

extern "C" {
@@ -68,9 +72,11 @@ extern "C" { 
/* The following functions were previously part of the DES section,

   and are provided here for backward compatibility reasons. */



#ifndef OPENSSL_NO_DES

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



int des_read_pw_string(char *buf,int length,const char *prompt,int verify);

int des_read_pw(char *buf,char *buff,int size,const char *prompt,int verify);