Fix couple of ANSI declarations and prototypes

diff --git a/CHANGES b/CHANGES
index 1e84e4933cc9c5070e6fb2a75bcabe0d7b9d44b4..95a0bd28c711993b2a6ecfbfdcc91b74da267858 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,7 +8,9 @@
   *) Fix Makefile.org so CC,CFLAG etc are passed to 'make links' add
      advapi32.lib to Win32 build and change the pem test comparision
      to fc.exe (thanks to Ulrich Kroener <kroneru@yahoo.com> for the
   *) Fix Makefile.org so CC,CFLAG etc are passed to 'make links' add
      advapi32.lib to Win32 build and change the pem test comparision
      to fc.exe (thanks to Ulrich Kroener <kroneru@yahoo.com> for the

-     suggestion).
+     suggestion). Fix misplaced ASNI prototypes and declarations in evp.h
+     and crypto/des/ede_cbcm_enc.c.
+     [Steve Henson]

 
   *) DES quad checksum was broken on big-endian architectures. Fixed.
      [Ben Laurie]
 
   *) DES quad checksum was broken on big-endian architectures. Fixed.
      [Ben Laurie]

diff --git a/crypto/des/ede_cbcm_enc.c b/crypto/des/ede_cbcm_enc.c
index 41890df327742db8e32e35e964aedbc5d9e5984b..caaf6daccec624a47d1d0efec0f670c5a2c36cd8 100644 (file)
--- a/crypto/des/ede_cbcm_enc.c
+++ b/crypto/des/ede_cbcm_enc.c
@@ -70,12 +70,16 @@ http://www.cs.technion.ac.il/users/wwwb/cgi-bin/tr-get.cgi/1998/CS/CS0928.ps.gz
 
 #include "des_locl.h"
 
 
 #include "des_locl.h"
 

-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_cbcm_encrypt(in, out, length, ks1, ks2, ks3, ivec1, ivec2, enc)
+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;

     {
     register DES_LONG tin0,tin1;
     register DES_LONG tout0,tout1,xor0,xor1,m0,m1;
     {
     register DES_LONG tin0,tin1;
     register DES_LONG tout0,tout1,xor0,xor1,m0,m1;

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 2655acd7fcdcde6dab3f0763c2168511ec23d423..3aad7d1d5f248fbc6f820f57082eff3759c304e8 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -765,8 +765,8 @@ int EVP_PKEY_missing_parameters();
 int EVP_PKEY_save_parameters();
 int EVP_PKEY_cmp_parameters();
 
 int EVP_PKEY_save_parameters();
 int EVP_PKEY_cmp_parameters();
 

-int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
+int EVP_CIPHER_param_to_asn1();
+int EVP_CIPHER_asn1_to_param();

 
 int EVP_CIPHER_set_asn1_iv();
 int EVP_CIPHER_get_asn1_iv();
 
 int EVP_CIPHER_set_asn1_iv();
 int EVP_CIPHER_get_asn1_iv();