des_cbc_encrypt / des_ncbc_encrypt issue.

[openssl.git] / crypto / des / des.h

diff --git a/crypto/des/des.h b/crypto/des/des.h
index 8d3ca115674837149fa09412c56713bd07e5c91d..141526ba05f0bdb5f85072e2691c78ec7984dddc 100644 (file)
--- a/crypto/des/des.h
+++ b/crypto/des/des.h
@@ -87,15 +87,11 @@ typedef /* const */ unsigned char const_des_cblock[8];
 typedef struct des_ks_struct
        {
        union   {
-               des_cblock _;
+               des_cblock cblock;
                /* make sure things are correct size on machines with
                 * 8 byte longs */
-               DES_LONG pad[2];
+               DES_LONG deslong[2];
                } ks;
-#if defined _
-# error "_ is defined, but some strange definition the DES library cannot handle that."
-#endif
-#define _      ks._
        int weak_key;
        } des_key_schedule[16];
 
@@ -120,7 +116,6 @@ typedef struct des_ks_struct
 #define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
        des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
 
-#define C_Block des_cblock
 #define Key_schedule des_key_schedule
 #ifdef KERBEROS
 #define ENCRYPT DES_ENCRYPT
@@ -156,6 +151,7 @@ void des_ecb3_encrypt(const_des_cblock *input, des_cblock *output,
 DES_LONG des_cbc_cksum(const unsigned char *input,des_cblock *output,
                       long length,des_key_schedule schedule,
                       const_des_cblock *ivec);
+/* des_cbc_encrypt does not update the IV!  Use des_ncbc_encrypt instead. */
 void des_cbc_encrypt(const unsigned char *input,unsigned char *output,
                     long length,des_key_schedule schedule,des_cblock *ivec,
                     int enc);
@@ -203,16 +199,9 @@ int des_enc_read(int fd,void *buf,int len,des_key_schedule sched,
 int des_enc_write(int fd,const void *buf,int len,des_key_schedule sched,
                  des_cblock *iv);
 char *des_fcrypt(const char *buf,const char *salt, char *ret);
-#if defined(PERL5) || defined(__FreeBSD__)
 char *des_crypt(const char *buf,const char *salt);
-#else
-/* some stupid compilers complain because I have declared char instead
- * of const char */
-#ifdef HEADER_DES_LOCL_H
+#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT)
 char *crypt(const char *buf,const char *salt);
-#else
-char *crypt();
-#endif
 #endif
 void des_ofb_encrypt(const unsigned char *in,unsigned char *out,int numbits,
                     long length,des_key_schedule schedule,des_cblock *ivec);