diff -Narup v6eval-3.0.15.orig/lib/Pz/MfAlgorithm.cc v6eval-3.0.15/lib/Pz/MfAlgorithm.cc --- v6eval-3.0.15.orig/lib/Pz/MfAlgorithm.cc Tue Jul 1 15:07:39 2008 +++ v6eval-3.0.15/lib/Pz/MfAlgorithm.cc Thu Oct 16 09:58:50 2008 @@ -217,6 +217,7 @@ void MfBLOWFISH::decrypt(OCTSTR os,OCTST scheduleKeys(key,schd); BF_cbc_encrypt(is,os,l,&schd,iv,DES_DECRYPT);} +#ifndef OPENSSL_NO_RC5 #include //---------------------------------------------------------------------- // RC5 CRYPT ALGORITHM @@ -234,6 +235,7 @@ void MfRC5::decrypt(OCTSTR os,OCTSTR is, RC5_32_KEY schd; scheduleKeys(key,schd); RC5_32_cbc_encrypt(is,os,l,&schd,iv,DES_DECRYPT);} +#endif // OPENSSL_NO_RC5 #include //---------------------------------------------------------------------- @@ -590,8 +592,10 @@ MfDESCBC::MfDESCBC(CSTR s,uint8_t k,uint MfDESCBC::~MfDESCBC() {} MfBLOWFISH::MfBLOWFISH(CSTR s,uint8_t k,uint8_t i,uint8_t a):MfCryptKey(s,k,i,a) {} MfBLOWFISH::~MfBLOWFISH() {} +#ifndef OPENSSL_NO_RC5 MfRC5::MfRC5(CSTR s,uint8_t k,uint8_t i,uint8_t a):MfCryptKey(s,k,i,a) {} MfRC5::~MfRC5() {} +#endif // OPENSSL_NO_RC5 MfCAST128::MfCAST128(CSTR s,uint8_t k,uint8_t i,uint8_t a):MfCryptKey(s,k,i,a) {} MfCAST128::~MfCAST128() {} MfDES3CBC::MfDES3CBC(CSTR s,uint8_t k,uint8_t i,uint8_t a):MfCryptKey(s,k,i,a) {} diff -Narup v6eval-3.0.15.orig/lib/Pz/MfAlgorithm.h v6eval-3.0.15/lib/Pz/MfAlgorithm.h --- v6eval-3.0.15.orig/lib/Pz/MfAlgorithm.h Tue Jul 1 15:07:39 2008 +++ v6eval-3.0.15/lib/Pz/MfAlgorithm.h Thu Oct 16 09:59:02 2008 @@ -48,7 +48,9 @@ #include #include #include +#ifndef OPENSSL_NO_RC5 #include +#endif // OPENSSL_NO_RC5 #include #include @@ -248,6 +250,7 @@ virtual void decrypt(OCTSTR,OCTSTR,uint3 }; //---------------------------------------------------------------------- +#ifndef OPENSSL_NO_RC5 class MfRC5:public MfCryptKey { public: MfRC5(CSTR,uint8_t,uint8_t,uint8_t); @@ -256,6 +259,7 @@ virtual ~MfRC5(); virtual void encrypt(OCTSTR,OCTSTR,uint32_t,const PObject*,OCTSTR) const; virtual void decrypt(OCTSTR,OCTSTR,uint32_t,const PObject*,OCTSTR) const; }; +#endif // OPENSSL_NO_RC5 //---------------------------------------------------------------------- class MfCAST128:public MfCryptKey { diff -Narup v6eval-3.0.15.orig/lib/pkt/LxLexer.cc v6eval-3.0.15/lib/pkt/LxLexer.cc --- v6eval-3.0.15.orig/lib/pkt/LxLexer.cc Tue Jul 1 15:07:39 2008 +++ v6eval-3.0.15/lib/pkt/LxLexer.cc Thu Oct 16 09:59:04 2008 @@ -285,7 +285,9 @@ void LxLexer::initialize() { function(new MfDESCBC("descbc",8,8,8)); function(new MfDESCBC_2("descbc_2", 8, 8, 8)); // binary args function(new MfBLOWFISH("blowfish",8,8,8)); +#ifndef OPENSSL_NO_RC5 function(new MfRC5("rc5",8,8,8)); +#endif // OPENSSL_NO_RC5 function(new MfCAST128("cast128",8,8,8)); function(new MfDES3CBC("des3cbc",8*3,8,8)); function(new MfDES3CBC_2("des3cbc_2", 8 * 3, 8, 8)); // binary args