Commit c5f070d5 authored by Ben Laurie's avatar Ben Laurie
Browse files

Whoops, forgot FIPS DES, also add EVPs for DES CFB1 and 8.

parent 1b9e8557

Makefile.org

+16 −5
Original line number Diff line number Diff line
@@ -177,11 +177,11 @@ DIRS= crypto fips ssl $(SHLIB_MARK) apps test tools 
SHLIBDIRS= fips crypto ssl



# dirs in crypto to build

SDIRS=  \

SDIRS=  objects \

	md2 md4 md5 sha mdc2 hmac ripemd \

	des rc2 rc4 rc5 idea bf cast \

	bn ec rsa dsa dh dso engine aes \

	buffer bio stack lhash rand err objects \

	buffer bio stack lhash rand err \

	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5



# tests to perform.  "alltests" is a special word indicating that all tests
@@ -231,7 +231,18 @@ sub_all: 
	do \

	if [ -d "$$i" ]; then \

		(cd $$i && echo "making all in $$i..." && \

		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAG='${ASFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' all ) || exit 1; \

		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAG='${ASFLAG}' SDIRS='$(SDIRS)' FDIRS='$(FDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' all ) || exit 1; \

	else \

		$(MAKE) $$i; \

	fi; \

	done;



sub_target:

	@for i in $(DIRS); \

	do \

	if [ -d "$$i" ]; then \

		(cd $$i && echo "making $(TARGET) in $$i..." && \

		$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' AS='${AS}' ASFLAG='${ASFLAG}' SDIRS='$(SDIRS)' FDIRS='$(FDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TARGET='$(TARGET)' sub_target ) || exit 1; \

	else \

		$(MAKE) $$i; \

	fi; \

crypto/des/cfb_enc.c

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ 
 * byte.

 */

void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,

		     long length, DES_key_schedule *schedule, DES_cblock *ivec, int enc)

		     long length, DES_key_schedule *schedule, DES_cblock *ivec,

		     int enc)

	{

	register DES_LONG d0,d1,v0,v1,n=(numbits+7)/8;

	register DES_LONG mask0,mask1;

crypto/des/des_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ 


#include "des_locl.h"



#ifndef FIPS



void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)

	{

	register DES_LONG l,r,t,u;
@@ -287,6 +289,8 @@ void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1, 
	data[1]=r;

	}



#endif /* ndef FIPS */



#ifndef DES_DEFAULT_OPTIONS



#undef CBC_ENC_C__DONT_UPDATE_IV

crypto/evp/e_aes.c

+7 −14
Original line number Diff line number Diff line
@@ -84,22 +84,15 @@ IMPLEMENT_BLOCK_CIPHER(aes_256, ks, AES, EVP_AES_KEY, 
		       EVP_CIPHER_get_asn1_iv,

		       NULL)



#define IMPLEMENT_CFBR(keysize,cbits) \

	BLOCK_CIPHER_func_cfb(aes_##keysize,AES,cbits,EVP_AES_KEY,ks) \

	BLOCK_CIPHER_def_cfb(aes_##keysize,EVP_AES_KEY, \

			     NID_aes_##keysize, keysize/8, 16, cbits, \

			     0, aes_init_key, NULL, \

			     EVP_CIPHER_set_asn1_iv, \

			     EVP_CIPHER_get_asn1_iv, \

			     NULL)

#define IMPLEMENT_AES_CFBR(ksize,cbits)	IMPLEMENT_CFBR(aes,AES,EVP_AES_KEY,ks,ksize,cbits,16)



IMPLEMENT_CFBR(128,1)

IMPLEMENT_CFBR(192,1)

IMPLEMENT_CFBR(256,1)

IMPLEMENT_AES_CFBR(128,1)

IMPLEMENT_AES_CFBR(192,1)

IMPLEMENT_AES_CFBR(256,1)



IMPLEMENT_CFBR(128,8)

IMPLEMENT_CFBR(192,8)

IMPLEMENT_CFBR(256,8)

IMPLEMENT_AES_CFBR(128,8)

IMPLEMENT_AES_CFBR(192,8)

IMPLEMENT_AES_CFBR(256,8)



static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

		   const unsigned char *iv, int enc)

crypto/evp/e_des.c

+37 −1
Original line number Diff line number Diff line
@@ -100,12 +100,48 @@ static int des_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 
	return 1;

}



/* Although we have a CFB-r implementation for DES, it doesn't pack the right

   way, so wrap it here */

static int des_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,

			   const unsigned char *in, unsigned int inl)

    {

    unsigned int n;

    unsigned char c[1],d[1];



    memset(out,0,(inl+7)/8);

    for(n=0 ; n < inl ; ++n)

	{

	c[0]=(in[n/8]&(1 << (7-n%8))) ? 0x80 : 0;

	DES_cfb_encrypt(c,d,1,1,ctx->cipher_data,(DES_cblock *)ctx->iv,

			ctx->encrypt);

	out[n/8]=(out[n/8]&~(1 << (7-n%8)))|((d[0]&0x80) >> (n%8));

	}



    return 1;

    }



static int des_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,

			   const unsigned char *in, unsigned int inl)

    {

    DES_cfb_encrypt(in,out,8,inl,ctx->cipher_data,(DES_cblock *)ctx->iv,

		    ctx->encrypt);



    return 1;

    }



BLOCK_CIPHER_defs(des, DES_key_schedule, NID_des, 8, 8, 8, 64,

			0, des_init_key, NULL,

			EVP_CIPHER_set_asn1_iv,

			EVP_CIPHER_get_asn1_iv,

			NULL)



BLOCK_CIPHER_def_cfb(des,DES_key_schedule,NID_des,8,8,1,0,des_init_key,NULL,

		     EVP_CIPHER_set_asn1_iv,

		     EVP_CIPHER_get_asn1_iv,NULL)



BLOCK_CIPHER_def_cfb(des,DES_key_schedule,NID_des,8,8,8,0,des_init_key,NULL,

		     EVP_CIPHER_set_asn1_iv,

		     EVP_CIPHER_get_asn1_iv,NULL)



static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,

			const unsigned char *iv, int enc)