From bdb1d0c24b3df3e2253cd8289cd619093524464e Mon Sep 17 00:00:00 2001 From: Viktor Dukhovni Date: Wed, 13 Jan 2016 12:12:17 -0500 Subject: Fix DES_LONG breakage For some strange reason opensslconf.h was only defining DES_LONG when included via des.h, but that's exceedingly fragile (as a result of include guards the include via des.h might not actually process the content again). Ripped out the nesting constraint, now always define OSSL_DES_LONG if not already defined. Note, this could just be DES_LONG, but trying to avoid exposing DES_LONG in places where it has never been seen before, so it is up to des.h to actually define DES_LONG as OSSL_DES_LONG. Reviewed-by: Rich Salz --- crypto/des/rpc_des.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'crypto/des/rpc_des.h') diff --git a/crypto/des/rpc_des.h b/crypto/des/rpc_des.h index 4db9062..986ac55 100644 --- a/crypto/des/rpc_des.h +++ b/crypto/des/rpc_des.h @@ -94,11 +94,6 @@ #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */ #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */ -#ifdef HEADER_DES_H -# undef ENCRYPT -# undef DECRYPT -#endif - enum desdir { ENCRYPT, DECRYPT }; enum desmode { CBC, ECB }; -- cgit v1.1