Break circular dependency between pem and err.

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

diff --git a/crypto/des/des.org b/crypto/des/des.org
index 1728fe88899271749220a88bfee9715a40c88be2..e7310b2783d14a493366e1bb4b45942c9a4b185c 100644 (file)
--- a/crypto/des/des.org
+++ b/crypto/des/des.org
@@ -90,6 +90,7 @@ typedef struct des_ks_struct
                } ks;
 #undef _
 #define _      ks._
+       int weak_key;
        } des_key_schedule[16];
 
 #define DES_KEY_SZ     (sizeof(des_cblock))
@@ -140,6 +141,7 @@ typedef des_key_schedule bit_64;
 
 extern int des_check_key;      /* defaults to false */
 extern int des_rw_mode;                /* defaults to DES_PCBC_MODE */
+extern int des_set_weak_key_flag; /* set the weak key flag */
 
 /* The next line is used to disable full ANSI prototypes, if your
  * compiler has problems with the prototypes, make sure this line always
@@ -161,9 +163,6 @@ void des_ncbc_encrypt(des_cblock *input,des_cblock *output,long length,
 void des_xcbc_encrypt(des_cblock *input,des_cblock *output,long length,
        des_key_schedule schedule,des_cblock *ivec,
        des_cblock *inw,des_cblock *outw,int enc);
-void des_3cbc_encrypt(des_cblock *input,des_cblock *output,long length,
-       des_key_schedule sk1,des_key_schedule sk2,
-       des_cblock *ivec1,des_cblock *ivec2,int enc);
 void des_cfb_encrypt(unsigned char *in,unsigned char *out,int numbits,
        long length,des_key_schedule schedule,des_cblock *ivec,int enc);
 void des_ecb_encrypt(des_cblock *input,des_cblock *output,
@@ -192,7 +191,7 @@ int des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
 int des_enc_write(int fd,char *buf,int len,des_key_schedule sched,
        des_cblock *iv);
 char *des_fcrypt(const char *buf,const char *salt, char *ret);
-#ifdef PERL5
+#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
@@ -246,7 +245,6 @@ DES_LONG des_cbc_cksum();
 void des_cbc_encrypt();
 void des_ncbc_encrypt();
 void des_xcbc_encrypt();
-void des_3cbc_encrypt();
 void des_cfb_encrypt();
 void des_ede3_cfb64_encrypt();
 void des_ede3_ofb64_encrypt();