Remove references to .org header file names.

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

diff --git a/crypto/des/des.h b/crypto/des/des.h
index a4cf5c8770b0cad0c1a01c83b3f91c2a6b4906a1..64c96138868ea2877e70f643f271206ea8f6dacf 100644 (file)
--- a/crypto/des/des.h
+++ b/crypto/des/des.h
@@ -1,4 +1,4 @@
-/* crypto/des/des.org */
+/* crypto/des/des.h */

 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *


@@ -56,14 +56,6 @@
  * [including the GNU Public Licence.]
  */
 
  * [including the GNU Public Licence.]
  */
 

-/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING 
- *
- * Always modify des.org since des.h is automatically generated from
- * it during SSLeay configuration.
- *
- * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- */
-

 #ifndef HEADER_DES_H
 #define HEADER_DES_H
 
 #ifndef HEADER_DES_H
 #define HEADER_DES_H
 


@@ -72,14 +64,11 @@ extern "C" {
 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>

-
-/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
- * %20 speed up (longs are 8 bytes, int's are 4). */
-#ifndef DES_LONG
-#define DES_LONG unsigned long
-#endif
+#include "opensslconf.h" /* DES_LONG */

 
 typedef unsigned char des_cblock[8];
 
 typedef unsigned char des_cblock[8];

+typedef unsigned char *des_cblocks; /* Unfortunately there's no way to say that
+                                      we want a multiple of 8 */

 typedef struct des_ks_struct
        {
        union   {
 typedef struct des_ks_struct
        {
        union   {


@@ -90,6 +79,7 @@ typedef struct des_ks_struct
                } ks;
 #undef _
 #define _      ks._
                } ks;
 #undef _
 #define _      ks._

+       int weak_key;

        } des_key_schedule[16];
 
 #define DES_KEY_SZ     (sizeof(des_cblock))
        } des_key_schedule[16];
 
 #define DES_KEY_SZ     (sizeof(des_cblock))


@@ -140,56 +130,64 @@ 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_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
- * evaluates to true :-) */
-#if defined(MSDOS) || defined(__STDC__)
-#undef NOPROTO
-#endif

 #ifndef NOPROTO
 #ifndef NOPROTO

-char *des_options(void);
-void des_ecb3_encrypt(des_cblock *input,des_cblock *output,
-       des_key_schedule ks1,des_key_schedule ks2,
-       des_key_schedule ks3, int enc);
-DES_LONG des_cbc_cksum(des_cblock *input,des_cblock *output,
-       long length,des_key_schedule schedule,des_cblock *ivec);
-void des_cbc_encrypt(des_cblock *input,des_cblock *output,long length,
-       des_key_schedule schedule,des_cblock *ivec,int enc);
-void des_ncbc_encrypt(des_cblock *input,des_cblock *output,long length,
-       des_key_schedule schedule,des_cblock *ivec,int enc);
-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_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,
-       des_key_schedule ks,int enc);
+const char *des_options(void);
+void des_ecb3_encrypt(const des_cblock input, des_cblock output,
+                     des_key_schedule ks1,des_key_schedule ks2,
+                     des_key_schedule ks3, int enc);
+DES_LONG des_cbc_cksum(const unsigned char *input,des_cblock output,
+                      long length,des_key_schedule schedule,
+                      const des_cblock ivec);
+void des_cbc_encrypt(const unsigned char *input,unsigned char *output,
+                    long length,des_key_schedule schedule,des_cblock ivec,
+                    int enc);
+void des_ncbc_encrypt(const unsigned char *input,unsigned char *output,
+                     long length,des_key_schedule schedule,des_cblock ivec,
+                     int enc);
+void des_xcbc_encrypt(const unsigned char *input,unsigned char *output,
+                     long length,des_key_schedule schedule,des_cblock ivec,
+                     const des_cblock inw,const des_cblock outw,int enc);
+void des_cfb_encrypt(const unsigned char *in,unsigned char *out,int numbits,
+                    long length,des_key_schedule schedule,des_cblock ivec,
+                    int enc);
+void des_ecb_encrypt(const des_cblock input,des_cblock output,
+                    des_key_schedule ks,int enc);

 void des_encrypt(DES_LONG *data,des_key_schedule ks, int enc);
 void des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc);
 void des_encrypt3(DES_LONG *data, des_key_schedule ks1,
        des_key_schedule ks2, des_key_schedule ks3);
 void des_decrypt3(DES_LONG *data, des_key_schedule ks1,
        des_key_schedule ks2, des_key_schedule ks3);
 void des_encrypt(DES_LONG *data,des_key_schedule ks, int enc);
 void des_encrypt2(DES_LONG *data,des_key_schedule ks, int enc);
 void des_encrypt3(DES_LONG *data, des_key_schedule ks1,
        des_key_schedule ks2, des_key_schedule ks3);
 void des_decrypt3(DES_LONG *data, des_key_schedule ks1,
        des_key_schedule ks2, des_key_schedule ks3);

-void des_ede3_cbc_encrypt(des_cblock *input, des_cblock *output, 
-       long length, des_key_schedule ks1, des_key_schedule ks2, 
-       des_key_schedule ks3, des_cblock *ivec, int enc);
-void des_ede3_cfb64_encrypt(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, int enc);
-void des_ede3_ofb64_encrypt(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);
+void des_ede3_cbc_encrypt(const unsigned char *input,unsigned char *output, 
+                         long length,
+                         des_key_schedule ks1,des_key_schedule ks2,
+                         des_key_schedule ks3,des_cblock ivec,int enc);
+void des_ede3_cbcm_encrypt(const unsigned char *in,unsigned char *out,
+                          long length,
+                          des_key_schedule ks1,des_key_schedule ks2,
+                          des_key_schedule ks3,
+                          des_cblock ivec1,des_cblock ivec2,
+                          int enc);
+void des_ede3_cfb64_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,int enc);
+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);

 
 

-void des_xwhite_in2out(des_cblock (*des_key), des_cblock (*in_white),
-       des_cblock (*out_white));
+void des_xwhite_in2out(const des_cblock des_key,const des_cblock in_white,
+                      des_cblock out_white);

 
 int des_enc_read(int fd,char *buf,int len,des_key_schedule sched,
 
 int des_enc_read(int fd,char *buf,int len,des_key_schedule sched,

-       des_cblock *iv);
-int des_enc_write(int fd,char *buf,int len,des_key_schedule sched,
-       des_cblock *iv);
+                des_cblock iv);
+int des_enc_write(int fd,const char *buf,int len,des_key_schedule sched,
+                 des_cblock iv);

 char *des_fcrypt(const char *buf,const char *salt, char *ret);
 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
 char *des_crypt(const char *buf,const char *salt);
 #else
 /* some stupid compilers complain because I have declared char instead


@@ -200,32 +198,34 @@ char *crypt(const char *buf,const char *salt);
 char *crypt();
 #endif
 #endif
 char *crypt();
 #endif
 #endif

-void des_ofb_encrypt(unsigned char *in,unsigned char *out,
-       int numbits,long length,des_key_schedule schedule,des_cblock *ivec);
-void des_pcbc_encrypt(des_cblock *input,des_cblock *output,long length,
-       des_key_schedule schedule,des_cblock *ivec,int enc);
-DES_LONG des_quad_cksum(des_cblock *input,des_cblock *output,
-       long length,int out_count,des_cblock *seed);
+void des_ofb_encrypt(const unsigned char *in,unsigned char *out,int numbits,
+                    long length,des_key_schedule schedule,des_cblock ivec);
+void des_pcbc_encrypt(const unsigned char *input,unsigned char *output,
+                     long length,des_key_schedule schedule,des_cblock ivec,
+                     int enc);
+DES_LONG des_quad_cksum(const unsigned char *input,des_cblocks output,
+                       long length,int out_count,des_cblock seed);

 void des_random_seed(des_cblock key);
 void des_random_key(des_cblock ret);
 void des_random_seed(des_cblock key);
 void des_random_key(des_cblock ret);

-int des_read_password(des_cblock *key,char *prompt,int verify);
-int des_read_2passwords(des_cblock *key1,des_cblock *key2,
-       char *prompt,int verify);
-int des_read_pw_string(char *buf,int length,char *prompt,int verify);
-void des_set_odd_parity(des_cblock *key);
-int des_is_weak_key(des_cblock *key);
-int des_set_key(des_cblock *key,des_key_schedule schedule);
-int des_key_sched(des_cblock *key,des_key_schedule schedule);
-void des_string_to_key(char *str,des_cblock *key);
-void des_string_to_2keys(char *str,des_cblock *key1,des_cblock *key2);
-void des_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
-       des_key_schedule schedule, des_cblock *ivec, int *num, int enc);
-void des_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
-       des_key_schedule schedule, des_cblock *ivec, int *num);
-int des_read_pw(char *buf, char *buff, int size, char *prompt, int verify);
+int des_read_password(des_cblock key,const char *prompt,int verify);
+int des_read_2passwords(des_cblock key1,des_cblock key2,
+                       const char *prompt,int verify);
+int des_read_pw_string(char *buf,int length,const char *prompt,int verify);
+void des_set_odd_parity(des_cblock key);
+int des_is_weak_key(const des_cblock key);
+int des_set_key(const des_cblock key,des_key_schedule schedule);
+int des_key_sched(const des_cblock key,des_key_schedule schedule);
+void des_string_to_key(const char *str,des_cblock key);
+void des_string_to_2keys(const char *str,des_cblock key1,des_cblock key2);
+void des_cfb64_encrypt(const unsigned char *in,unsigned char *out,long length,
+                      des_key_schedule schedule,des_cblock ivec,int *num,
+                      int enc);
+void des_ofb64_encrypt(const unsigned char *in,unsigned char *out,long length,
+                      des_key_schedule schedule,des_cblock ivec,int *num);
+int des_read_pw(char *buf,char *buff,int size,const char *prompt,int verify);

 
 /* Extra functions from Mark Murray <mark@grondar.za> */
 
 /* Extra functions from Mark Murray <mark@grondar.za> */

-void des_cblock_print_file(des_cblock *cb, FILE *fp);
+void des_cblock_print_file(const des_cblock cb, FILE *fp);

 /* The following functions are not in the normal unix build or the
  * SSLeay build.  When using the SSLeay build, use RAND_seed()
  * and RAND_bytes() instead. */
 /* The following functions are not in the normal unix build or the
  * SSLeay build.  When using the SSLeay build, use RAND_seed()
  * and RAND_bytes() instead. */


@@ -252,6 +252,7 @@ void des_encrypt2();
 void des_encrypt3();
 void des_decrypt3();
 void des_ede3_cbc_encrypt();
 void des_encrypt3();
 void des_decrypt3();
 void des_ede3_cbc_encrypt();

+void des_ede3_cbcm_encrypt();

 int des_enc_read();
 int des_enc_write();
 char *des_fcrypt();
 int des_enc_read();
 int des_enc_write();
 char *des_fcrypt();