OpenSSL 0.9.4 merge

1 files changed, 26 insertions, 38 deletions

diff --git a/src/lib/libcrypto/evp/e_cbc_3d.c b/src/lib/libcrypto/evp/e_cbc_3d.c
index 5761bf186a..02ccc6dc90 100644
--- a/src/lib/libcrypto/evp/e_cbc_3d.c
+++ b/src/lib/libcrypto/evp/e_cbc_3d.c
@@ -56,24 +56,18 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef NO_DES
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
-#ifndef NOPROTO
 static void des_cbc_ede_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
         unsigned char *iv,int enc);
 static void des_cbc_ede3_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
         unsigned char *iv,int enc);
 static void des_cbc_ede_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         unsigned char *in, unsigned int inl);
-#else
-static void des_cbc_ede_init_key();
-static void des_cbc_ede3_init_key();
-static void des_cbc_ede_cipher();
-#endif
-
 static EVP_CIPHER d_cbc_ede_cipher2=
         {
         NID_des_ede_cbc,
@@ -83,8 +77,8 @@ static EVP_CIPHER d_cbc_ede_cipher2=
         NULL,
         sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
                 sizeof((((EVP_CIPHER_CTX *)NULL)->c.des_ede)),
-        EVP_CIPHER_get_asn1_iv,
         EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
         };
 
 static EVP_CIPHER d_cbc_ede_cipher3=
@@ -100,64 +94,58 @@ static EVP_CIPHER d_cbc_ede_cipher3=
         EVP_CIPHER_get_asn1_iv,
         };
 
-EVP_CIPHER *EVP_des_ede_cbc()
+EVP_CIPHER *EVP_des_ede_cbc(void)
         {
         return(&d_cbc_ede_cipher2);
         }
 
-EVP_CIPHER *EVP_des_ede3_cbc()
+EVP_CIPHER *EVP_des_ede3_cbc(void)
         {
         return(&d_cbc_ede_cipher3);
         }
         
-static void des_cbc_ede_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void des_cbc_ede_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+             unsigned char *iv, int enc)
         {
+        des_cblock *deskey = (des_cblock *)key;
+
         if (iv != NULL)
                 memcpy(&(ctx->oiv[0]),iv,8);
         memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
 
-        if (key != NULL)
+        if (deskey != NULL)
                 {
-                des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
-                des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
+                des_set_key(&deskey[0],ctx->c.des_ede.ks1);
+                des_set_key(&deskey[1],ctx->c.des_ede.ks2);
                 memcpy( (char *)ctx->c.des_ede.ks3,
                         (char *)ctx->c.des_ede.ks1,
                         sizeof(ctx->c.des_ede.ks1));
                 }
         }
 
-static void des_cbc_ede3_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void des_cbc_ede3_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+             unsigned char *iv, int enc)
         {
+        des_cblock *deskey = (des_cblock *)key;
+
         if (iv != NULL)
                 memcpy(&(ctx->oiv[0]),iv,8);
         memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
 
-        if (key != NULL)
+        if (deskey != NULL)
                 {
-                des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
-                des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
-                des_set_key((des_cblock *)&(key[16]),ctx->c.des_ede.ks3);
+                des_set_key(&deskey[0],ctx->c.des_ede.ks1);
+                des_set_key(&deskey[1],ctx->c.des_ede.ks2);
+                des_set_key(&deskey[2],ctx->c.des_ede.ks3);
                 }
         }
 
-static void des_cbc_ede_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void des_cbc_ede_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+             unsigned char *in, unsigned int inl)
         {
-        des_ede3_cbc_encrypt(
-                (des_cblock *)in,(des_cblock *)out,
-                (long)inl, ctx->c.des_ede.ks1,
+        des_ede3_cbc_encrypt(in,out,inl, ctx->c.des_ede.ks1,
                 ctx->c.des_ede.ks2,ctx->c.des_ede.ks3,
-                (des_cblock *)&(ctx->iv[0]),
+                (des_cblock *) &(ctx->iv[0]),
                 ctx->encrypt);
         }
+#endif