From 64ddafc6b6e44f4504bcf8896bb260c027a44dbe Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Tue, 20 May 2008 11:52:57 +0000 Subject: [PATCH] Update from stable branch. --- crypto/des/des.h | 3 ++- crypto/des/des_old.h | 3 ++- util/mk1mf.pl | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/crypto/des/des.h b/crypto/des/des.h index 3cbc2b568e..92b6663599 100644 --- a/crypto/des/des.h +++ b/crypto/des/des.h @@ -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); diff --git a/crypto/des/des_old.h b/crypto/des/des_old.h index 1b0620c3a2..2b2c372354 100644 --- a/crypto/des/des_old.h +++ b/crypto/des/des_old.h @@ -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); diff --git a/util/mk1mf.pl b/util/mk1mf.pl index f5ac596d2e..93d10a59e9 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -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, -- 2.25.1