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

Add support for partial CFB modes, make tests work, update dependencies.

parent 9163658a

Makefile.org

+5 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ ONEDIRS=out tmp 
EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS

WDIRS=  windows

LIBS=   libcrypto.a libssl.a

SIGS=	libcrypto.a.sha1 libcrypto$(SHLIBEXT).sha1

SIGS=	libcrypto.sha1

SHARED_CRYPTO=libcrypto$(SHLIB_EXT)

SHARED_SSL=libssl$(SHLIB_EXT)

SHARED_LIBS=
@@ -222,6 +222,10 @@ HEADER= e_os.h 


all: Makefile.ssl sub_all openssl.pc sigs



sigs:

	fips/sha1/fips_standalone_sha1 libcrypto.a > libcrypto.sha1

	if [ "$(SHLIBEXT)" != "" ]; then fips/sha1/fips_standalone_sha1 libcrypto$(SHLIBEXT) >> libcrypto.sha1; fi



sub_all:

	@for i in $(DIRS); \

	do \

crypto/aes/aes.h

+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ void AES_cbc_encrypt(const unsigned char *in, unsigned char *out, 
void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,

	const unsigned long length, const AES_KEY *key,

	unsigned char *ivec, int *num, const int enc);

void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,

	const unsigned long length, const AES_KEY *key,

	unsigned char *ivec, int *num, const int enc);

void AES_cfbr_encrypt_block(const unsigned char *in,unsigned char *out,

			    const int nbits,const AES_KEY *key,

			    unsigned char *ivec,const int enc);

crypto/aes/aes_cfb.c

+19 −0
Original line number Diff line number Diff line
@@ -212,3 +212,22 @@ void AES_cfbr_encrypt_block(const unsigned char *in,unsigned char *out, 
	}

    /* it is not necessary to cleanse ovec, since the IV is not secret */

    }



/* N.B. This expects the input to be packed, LS bit first */

void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,

		      const unsigned long length, const AES_KEY *key,

		      unsigned char *ivec, int *num, const int enc)

    {

    unsigned int n;

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

    assert(in && out && key && ivec && num);

    assert(*num == 0);



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

	{

	c[0]=!!(in[n/8]&(1 << (n%8)));

	AES_cfbr_encrypt_block(c,d,1,key,ivec,enc);

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

	}

    }

crypto/dsa/Makefile.ssl

+3 −2
Original line number Diff line number Diff line
@@ -157,8 +157,9 @@ dsa_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h 
dsa_sign.o: ../../include/openssl/err.h ../../include/openssl/fips.h

dsa_sign.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h

dsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

dsa_sign.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h

dsa_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

dsa_sign.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h

dsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

dsa_sign.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h

dsa_sign.o: ../cryptlib.h dsa_sign.c

dsa_vrf.o: ../../e_os.h ../../include/openssl/asn1.h

dsa_vrf.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h

crypto/err/Makefile.ssl

+17 −16
Original line number Diff line number Diff line
@@ -94,22 +94,23 @@ err_all.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h 
err_all.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h

err_all.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h

err_all.o: ../../include/openssl/engine.h ../../include/openssl/err.h

err_all.o: ../../include/openssl/evp.h ../../include/openssl/idea.h

err_all.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h

err_all.o: ../../include/openssl/md4.h ../../include/openssl/md5.h

err_all.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h

err_all.o: ../../include/openssl/objects.h ../../include/openssl/ocsp.h

err_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

err_all.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem2.h

err_all.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h

err_all.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h

err_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h

err_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h

err_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

err_all.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

err_all.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h

err_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

err_all.o: ../../include/openssl/x509v3.h err_all.c

err_all.o: ../../include/openssl/evp.h ../../include/openssl/fips.h

err_all.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h

err_all.o: ../../include/openssl/md2.h ../../include/openssl/md4.h

err_all.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h

err_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

err_all.o: ../../include/openssl/ocsp.h ../../include/openssl/opensslconf.h

err_all.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

err_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h

err_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h

err_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h

err_all.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h

err_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

err_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

err_all.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h

err_all.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h

err_all.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h

err_all.o: err_all.c

err_prn.o: ../../e_os.h ../../include/openssl/bio.h

err_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h