summaryrefslogtreecommitdiffstats
path: root/crypto/des
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2015-01-27 17:44:12 -0500
committerRich Salz <rsalz@openssl.org>2015-01-27 17:44:12 -0500
commit1a5adcfb5edfe23908b350f8757df405b0f5f71f (patch)
tree1fd7eeff1276c7e1847c2bc10aba1ea432793e87 /crypto/des
parent63c574f6a639cfa3f53476080054526e6bfa3bc9 (diff)
"#if 0" removal: header files
Remove all "#if 0" blocks from header files. Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/des')
-rw-r--r--crypto/des/des.h5
-rw-r--r--crypto/des/des_old.h18
2 files changed, 0 insertions, 23 deletions
diff --git a/crypto/des/des.h b/crypto/des/des.h
index 0accc9b723..589b73b4c8 100644
--- a/crypto/des/des.h
+++ b/crypto/des/des.h
@@ -194,11 +194,6 @@ 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);
int DES_enc_write(int fd, const void *buf, int len, DES_key_schedule *sched,
diff --git a/crypto/des/des_old.h b/crypto/des/des_old.h
index baa4b7d338..998ac09af1 100644
--- a/crypto/des/des_old.h
+++ b/crypto/des/des_old.h
@@ -175,14 +175,6 @@ typedef struct _ossl_old_des_ks_struct {
DES_enc_write((f),(b),(l),&(k),(iv))
# define des_fcrypt(b,s,r)\
DES_fcrypt((b),(s),(r))
-# if 0
-# define des_crypt(b,s)\
- DES_crypt((b),(s))
-# if !defined(PERL5) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
-# define crypt(b,s)\
- DES_crypt((b),(s))
-# endif
-# endif
# define des_ofb_encrypt(i,o,n,l,k,iv)\
DES_ofb_encrypt((i),(o),(n),(l),&(k),(iv))
# define des_pcbc_encrypt(i,o,l,k,iv,e)\
@@ -281,10 +273,6 @@ typedef struct _ossl_old_des_ks_struct {
_ossl_old_des_fcrypt((b),(s),(r))
# define des_crypt(b,s)\
_ossl_old_des_crypt((b),(s))
-# if 0
-# define crypt(b,s)\
- _ossl_old_crypt((b),(s))
-# endif
# define des_ofb_encrypt(i,o,n,l,k,iv)\
_ossl_old_des_ofb_encrypt((i),(o),(n),(l),(k),(iv))
# define des_pcbc_encrypt(i,o,l,k,iv,e)\
@@ -392,12 +380,6 @@ void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
_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);