diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-04-15 20:49:01 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-04-15 20:49:01 +0000 |
| commit | a1c60bda124d2507c5115a449064fc224177811b (patch) | |
| tree | 8b9b0bf1e2b1b7ab3cbb5a217dcc3c55f1483827 | |
| parent | f181da99290629d85132184b2eeeab20e4bc8fcf (diff) | |
12 years ago, old_des.h was used to provide compatibility with libdes.
The man page says "Compatibility des_ functions are provided for a short
while" and indeed even the original commit message says "The compatibility
functions will be removed in some future release, at the latest in
version 1.0." So here we are, a short while later.
Now I've only been an OpenBSD developer for 11 years, one year less than
this header has existed, but in that brief time, I've learned a thing or
two about deleting obsolete code. It doesn't delete itself. And worse,
people will continue using it until you force them onto a better path.
| -rw-r--r-- | lib/libcrypto/des/Makefile | 6 | ||||
| -rw-r--r-- | lib/libcrypto/des/des.h | 10 |
2 files changed, 3 insertions, 13 deletions
diff --git a/lib/libcrypto/des/Makefile b/lib/libcrypto/des/Makefile index 9f54c243b42..50366fb40e0 100644 --- a/lib/libcrypto/des/Makefile +++ b/lib/libcrypto/des/Makefile @@ -28,7 +28,7 @@ LIBSRC= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ qud_cksm.c rand_key.c rpc_enc.c set_key.c \ des_enc.c fcrypt_b.c \ xcbc_enc.c \ - str2key.c cfb64ede.c ofb64ede.c ede_cbcm_enc.c des_old.c des_old2.c \ + str2key.c cfb64ede.c ofb64ede.c ede_cbcm_enc.c \ read2pwd.c LIBOBJ= set_key.o ecb_enc.o cbc_enc.o \ @@ -37,11 +37,11 @@ LIBOBJ= set_key.o ecb_enc.o cbc_enc.o \ ofb_enc.o str2key.o pcbc_enc.o qud_cksm.o rand_key.o \ ${DES_ENC} \ fcrypt.o xcbc_enc.o rpc_enc.o cbc_cksm.o \ - ede_cbcm_enc.o des_old.o des_old2.o read2pwd.o + ede_cbcm_enc.o read2pwd.o SRC= $(LIBSRC) -EXHEADER= des.h des_old.h +EXHEADER= des.h HEADER= des_locl.h rpc_des.h spr.h des_ver.h $(EXHEADER) ALL= $(GENERAL) $(SRC) $(HEADER) diff --git a/lib/libcrypto/des/des.h b/lib/libcrypto/des/des.h index 92b66635998..c06b706e9cb 100644 --- a/lib/libcrypto/des/des.h +++ b/lib/libcrypto/des/des.h @@ -91,16 +91,6 @@ typedef struct DES_ks } ks[16]; } DES_key_schedule; -#ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT -# ifndef OPENSSL_ENABLE_OLD_DES_SUPPORT -# define OPENSSL_ENABLE_OLD_DES_SUPPORT -# endif -#endif - -#ifdef OPENSSL_ENABLE_OLD_DES_SUPPORT -# include <openssl/des_old.h> -#endif - #define DES_KEY_SZ (sizeof(DES_cblock)) #define DES_SCHEDULE_SZ (sizeof(DES_key_schedule)) |