4 files changed, 4 insertions, 78 deletions

diff --git a/src/lib/libcrypto/des/cfb64ede.c b/src/lib/libcrypto/des/cfb64ede.c
index 0b5c7d6249..6d4d287775 100644
--- a/src/lib/libcrypto/des/cfb64ede.c
+++ b/src/lib/libcrypto/des/cfb64ede.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfb64ede.c,v 1.8 2014/10/28 07:35:58 jsg Exp $ */
+/* $OpenBSD: cfb64ede.c,v 1.9 2015/02/07 13:19:15 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -132,15 +132,6 @@ void DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
         *num=n;
         }
 
-#ifdef undef /* MACRO */
-void DES_ede2_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
-             DES_key_schedule ks1, DES_key_schedule ks2, DES_cblock (*ivec),
-             int *num, int enc)
-        {
-        DES_ede3_cfb64_encrypt(in,out,length,ks1,ks2,ks1,ivec,num,enc);
-        }
-#endif
-
 /* This is compatible with the single key CFB-r for DES, even thought that's
  * not what EVP needs.
  */
diff --git a/src/lib/libcrypto/des/des.h b/src/lib/libcrypto/des/des.h
index e7585bc3d9..e1331d3fa2 100644
--- a/src/lib/libcrypto/des/des.h
+++ b/src/lib/libcrypto/des/des.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: des.h,v 1.18 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: des.h,v 1.19 2015/02/07 13:19:15 doug Exp $ */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -178,11 +178,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/src/lib/libcrypto/des/ofb64ede.c b/src/lib/libcrypto/des/ofb64ede.c
index 1d916e9305..474d38caaf 100644
--- a/src/lib/libcrypto/des/ofb64ede.c
+++ b/src/lib/libcrypto/des/ofb64ede.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ofb64ede.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */
+/* $OpenBSD: ofb64ede.c,v 1.6 2015/02/07 13:19:15 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -105,8 +105,6 @@ void DES_ede3_ofb64_encrypt(const unsigned char *in,
                 }
         if (save)
                 {
-/*              v0=ti[0];
-                v1=ti[1];*/
                 iv = &(*ivec)[0];
                 l2c(v0,iv);
                 l2c(v1,iv);
@@ -114,12 +112,3 @@ void DES_ede3_ofb64_encrypt(const unsigned char *in,
         v0=v1=ti[0]=ti[1]=0;
         *num=n;
         }
-
-#ifdef undef /* MACRO */
-void DES_ede2_ofb64_encrypt(unsigned char *in,
-             unsigned char *out, long length, DES_key_schedule k1,
-             DES_key_schedule k2, DES_cblock (*ivec), int *num)
-        {
-        DES_ede3_ofb64_encrypt(in, out, length, k1,k2,k1, ivec, num);
-        }
-#endif
diff --git a/src/lib/libcrypto/des/xcbc_enc.c b/src/lib/libcrypto/des/xcbc_enc.c
index dc4607e8aa..4f7a070103 100644
--- a/src/lib/libcrypto/des/xcbc_enc.c
+++ b/src/lib/libcrypto/des/xcbc_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xcbc_enc.c,v 1.8 2014/10/28 07:35:58 jsg Exp $ */
+/* $OpenBSD: xcbc_enc.c,v 1.9 2015/02/07 13:19:15 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -60,55 +60,6 @@
 
 /* RSA's DESX */
 
-#if 0 /* broken code, preserved just in case anyone specifically looks for this */
-static const unsigned char desx_white_in2out[256]={
-0xBD,0x56,0xEA,0xF2,0xA2,0xF1,0xAC,0x2A,0xB0,0x93,0xD1,0x9C,0x1B,0x33,0xFD,0xD0,
-0x30,0x04,0xB6,0xDC,0x7D,0xDF,0x32,0x4B,0xF7,0xCB,0x45,0x9B,0x31,0xBB,0x21,0x5A,
-0x41,0x9F,0xE1,0xD9,0x4A,0x4D,0x9E,0xDA,0xA0,0x68,0x2C,0xC3,0x27,0x5F,0x80,0x36,
-0x3E,0xEE,0xFB,0x95,0x1A,0xFE,0xCE,0xA8,0x34,0xA9,0x13,0xF0,0xA6,0x3F,0xD8,0x0C,
-0x78,0x24,0xAF,0x23,0x52,0xC1,0x67,0x17,0xF5,0x66,0x90,0xE7,0xE8,0x07,0xB8,0x60,
-0x48,0xE6,0x1E,0x53,0xF3,0x92,0xA4,0x72,0x8C,0x08,0x15,0x6E,0x86,0x00,0x84,0xFA,
-0xF4,0x7F,0x8A,0x42,0x19,0xF6,0xDB,0xCD,0x14,0x8D,0x50,0x12,0xBA,0x3C,0x06,0x4E,
-0xEC,0xB3,0x35,0x11,0xA1,0x88,0x8E,0x2B,0x94,0x99,0xB7,0x71,0x74,0xD3,0xE4,0xBF,
-0x3A,0xDE,0x96,0x0E,0xBC,0x0A,0xED,0x77,0xFC,0x37,0x6B,0x03,0x79,0x89,0x62,0xC6,
-0xD7,0xC0,0xD2,0x7C,0x6A,0x8B,0x22,0xA3,0x5B,0x05,0x5D,0x02,0x75,0xD5,0x61,0xE3,
-0x18,0x8F,0x55,0x51,0xAD,0x1F,0x0B,0x5E,0x85,0xE5,0xC2,0x57,0x63,0xCA,0x3D,0x6C,
-0xB4,0xC5,0xCC,0x70,0xB2,0x91,0x59,0x0D,0x47,0x20,0xC8,0x4F,0x58,0xE0,0x01,0xE2,
-0x16,0x38,0xC4,0x6F,0x3B,0x0F,0x65,0x46,0xBE,0x7E,0x2D,0x7B,0x82,0xF9,0x40,0xB5,
-0x1D,0x73,0xF8,0xEB,0x26,0xC7,0x87,0x97,0x25,0x54,0xB1,0x28,0xAA,0x98,0x9D,0xA5,
-0x64,0x6D,0x7A,0xD4,0x10,0x81,0x44,0xEF,0x49,0xD6,0xAE,0x2E,0xDD,0x76,0x5C,0x2F,
-0xA7,0x1C,0xC9,0x09,0x69,0x9A,0x83,0xCF,0x29,0x39,0xB9,0xE9,0x4C,0xFF,0x43,0xAB,
-        };
-
-void DES_xwhite_in2out(const_DES_cblock *des_key, const_DES_cblock *in_white,
-             DES_cblock *out_white)
-        {
-        int out0,out1;
-        int i;
-        const unsigned char *key = &(*des_key)[0];
-        const unsigned char *in = &(*in_white)[0];
-        unsigned char *out = &(*out_white)[0];
-
-        out[0]=out[1]=out[2]=out[3]=out[4]=out[5]=out[6]=out[7]=0;
-        out0=out1=0;
-        for (i=0; i<8; i++)
-                {
-                out[i]=key[i]^desx_white_in2out[out0^out1];
-                out0=out1;
-                out1=(int)out[i&0x07];
-                }
-
-        out0=out[0];
-        out1=out[i]; /* BUG: out-of-bounds read */
-        for (i=0; i<8; i++)
-                {
-                out[i]=in[i]^desx_white_in2out[out0^out1];
-                out0=out1;
-                out1=(int)out[i&0x07];
-                }
-        }
-#endif
-
 void DES_xcbc_encrypt(const unsigned char *in, unsigned char *out,
                       long length, DES_key_schedule *schedule,
                       DES_cblock *ivec, const_DES_cblock *inw,