Commit 63da21c0 authored by Bodo Möller's avatar Bodo Möller
Browse files

make no-des and no-rc2 work.

parent b64e735b

Configure

+1 −0
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ foreach (@ARGV) 
		$depflags .= "-DNO_$algo ";

		if ($algo eq "DES")

			{

			push @skip, "mdc2";

			$options .= " no-mdc2";

			$flags .= "-DNO_MDC2 ";

			$depflags .= "-DNO_MDC2 ";

apps/smime.c

+18 −2
Original line number Diff line number Diff line
@@ -110,16 +110,20 @@ int MAIN(int argc, char **argv) 
		else if (!strcmp (*args, "-sign")) operation = SMIME_SIGN;

		else if (!strcmp (*args, "-verify")) operation = SMIME_VERIFY;

		else if (!strcmp (*args, "-pk7out")) operation = SMIME_PK7OUT;

#ifndef NO_DES

		else if (!strcmp (*args, "-des3")) 

				cipher = EVP_des_ede3_cbc();

		else if (!strcmp (*args, "-des")) 

				cipher = EVP_des_cbc();

#endif

#ifndef NO_RC2

		else if (!strcmp (*args, "-rc2-40")) 

				cipher = EVP_rc2_40_cbc();

		else if (!strcmp (*args, "-rc2-128")) 

				cipher = EVP_rc2_cbc();

		else if (!strcmp (*args, "-rc2-64")) 

				cipher = EVP_rc2_64_cbc();

#endif

		else if (!strcmp (*args, "-text")) 

				flags |= PKCS7_TEXT;

		else if (!strcmp (*args, "-nointern"))
@@ -233,10 +237,15 @@ int MAIN(int argc, char **argv) 
		BIO_printf (bio_err, "-sign          sign message\n");

		BIO_printf (bio_err, "-verify        verify signed message\n");

		BIO_printf (bio_err, "-pk7out        output PKCS#7 structure\n");

#ifndef NO_DES

		BIO_printf (bio_err, "-des3          encrypt with triple DES\n");

		BIO_printf (bio_err, "-rc2-40        encrypt with RC2-40\n");

		BIO_printf (bio_err, "-des           encrypt with DES\n");

#endif

#ifndef NO_RC2

		BIO_printf (bio_err, "-rc2-40        encrypt with RC2-40 (default)\n");

		BIO_printf (bio_err, "-rc2-64        encrypt with RC2-64\n");

		BIO_printf (bio_err, "-rc2-128       encrypt with RC2-128\n");

#endif

		BIO_printf (bio_err, "-nointern      don't search certificates in message for signer\n");

		BIO_printf (bio_err, "-nosigs        don't verify message signature\n");

		BIO_printf (bio_err, "-noverify      don't verify signers certificate\n");
@@ -271,7 +280,14 @@ int MAIN(int argc, char **argv) 
	}



	if(operation == SMIME_ENCRYPT) {

		if (!cipher) cipher = EVP_rc2_40_cbc();

		if (!cipher) {

#ifndef NO_RC2			

			cipher = EVP_rc2_40_cbc();

#else

			BIO_printf(bio_err, "No cipher selected\n");

			goto end;

#endif

		}

		encerts = sk_X509_new_null();

		while (*args) {

			if(!(cert = load_cert(*args))) {

apps/speed.c

+6 −1
Original line number Diff line number Diff line
@@ -616,6 +616,7 @@ int MAIN(int argc, char **argv) 
	memset(rsa_c,0,sizeof(rsa_c));

#endif

#ifndef SIGALRM

#ifndef NO_DES

	BIO_printf(bio_err,"First we calculate the approximate speed ...\n");

	count=10;

	do	{
@@ -707,10 +708,14 @@ int MAIN(int argc, char **argv) 
#define COND(d)	(count < (d))

#define COUNT(d) (d)

#else

/* not worth fixing */

# error "You cannot disable DES on systems without SIGALRM."

#endif /* NO_DES */

#else

#define COND(c)	(run)

#define COUNT(d) (count)

	signal(SIGALRM,sig_done);

#endif

#endif /* SIGALRM */



#ifndef NO_MD2

	if (doit[D_MD2])

crypto/Makefile.ssl

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ buildinf.h: ../Makefile.ssl 
	echo "#endif" ) >buildinf.h



testapps:

	cd des && $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' des

	if echo ${SDIRS} | fgrep ' des '; \

	then cd des && $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' des; fi

	cd pkcs7 && $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' testapps



subdirs:

crypto/evp/evp_key.c

+7 −4
Original line number Diff line number Diff line
@@ -81,15 +81,18 @@ char *EVP_get_pw_prompt(void) 
		return(prompt_string);

	}



#ifdef NO_DES

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

#endif



/* For historical reasons, the standard function for reading passwords is

 * in the DES library -- if someone ever wants to disable DES,

 * this function will fail */

int EVP_read_pw_string(char *buf, int len, const char *prompt, int verify)

	{

#ifndef NO_DES

	if ((prompt == NULL) && (prompt_string[0] != '\0'))

		prompt=prompt_string;

	return(des_read_pw_string(buf,len,prompt,verify));

#else

	return -1;

#endif

	}



int EVP_BytesToKey(const EVP_CIPHER *type, EVP_MD *md, unsigned char *salt,