Commit 64ddafc6 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from stable branch.

parent 781f0a9b

crypto/des/des.h

+2 −1
Original line number Diff line number Diff line
@@ -195,9 +195,10 @@ void DES_ede3_ofb64_encrypt(const unsigned char *in,unsigned char *out, 
			    long length,DES_key_schedule *ks1,

			    DES_key_schedule *ks2,DES_key_schedule *ks3,

			    DES_cblock *ivec,int *num);



#if 0

void DES_xwhite_in2out(const_DES_cblock *DES_key,const_DES_cblock *in_white,

		       DES_cblock *out_white);

#endif



int DES_enc_read(int fd,void *buf,int len,DES_key_schedule *sched,

		 DES_cblock *iv);

crypto/des/des_old.h

+2 −1
Original line number Diff line number Diff line
@@ -364,9 +364,10 @@ void _ossl_old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out, 
void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,

	long length, _ossl_old_des_key_schedule ks1, _ossl_old_des_key_schedule ks2,

	_ossl_old_des_key_schedule ks3, _ossl_old_des_cblock *ivec, int *num);



#if 0

void _ossl_old_des_xwhite_in2out(_ossl_old_des_cblock (*des_key), _ossl_old_des_cblock (*in_white),

	_ossl_old_des_cblock (*out_white));

#endif



int _ossl_old_des_enc_read(int fd,char *buf,int len,_ossl_old_des_key_schedule sched,

	_ossl_old_des_cblock *iv);

util/mk1mf.pl

+1 −0
Original line number Diff line number Diff line
@@ -1058,6 +1058,7 @@ sub read_options 
		"shared" => 0,

		"no-gmp" => 0,

		"no-rfc3779" => 0,

		"no-montasm" => 0,

		"no-shared" => 0,

		"no-zlib" => 0,

		"no-zlib-dynamic" => 0,