1 files changed, 16 insertions, 17 deletions

diff --git a/src/lib/libcrypto/evp/e_xcbc_d.c b/src/lib/libcrypto/evp/e_xcbc_d.c
index 7568fad4ff..e5b15acc7d 100644
--- a/src/lib/libcrypto/evp/e_xcbc_d.c
+++ b/src/lib/libcrypto/evp/e_xcbc_d.c
@@ -62,14 +62,15 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 
-static void desx_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
-        unsigned char *iv,int enc);
-static void desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-        unsigned char *in, unsigned int inl);
+static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                             const unsigned char *iv,int enc);
+static int desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+                           const unsigned char *in, unsigned int inl);
 static EVP_CIPHER d_xcbc_cipher=
         {
         NID_desx_cbc,
         8,24,8,
+        EVP_CIPH_CBC_MODE,
         desx_cbc_init_key,
         desx_cbc_cipher,
         NULL,
@@ -77,6 +78,7 @@ static EVP_CIPHER d_xcbc_cipher=
                 sizeof((((EVP_CIPHER_CTX *)NULL)->c.desx_cbc)),
         EVP_CIPHER_set_asn1_iv,
         EVP_CIPHER_get_asn1_iv,
+        NULL
         };
 
 EVP_CIPHER *EVP_desx_cbc(void)
@@ -84,29 +86,26 @@ EVP_CIPHER *EVP_desx_cbc(void)
         return(&d_xcbc_cipher);
         }
         
-static void desx_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
-             unsigned char *iv, int enc)
+static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                             const 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 (deskey != NULL)
-                {
-                des_set_key_unchecked(deskey,ctx->c.desx_cbc.ks);
-                memcpy(&(ctx->c.desx_cbc.inw[0]),&(key[8]),8);
-                memcpy(&(ctx->c.desx_cbc.outw[0]),&(key[16]),8);
-                }
+        des_set_key_unchecked(deskey,ctx->c.desx_cbc.ks);
+        memcpy(&(ctx->c.desx_cbc.inw[0]),&(key[8]),8);
+        memcpy(&(ctx->c.desx_cbc.outw[0]),&(key[16]),8);
+
+        return 1;
         }
 
-static void desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-             unsigned char *in, unsigned int inl)
+static int desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+                           const unsigned char *in, unsigned int inl)
         {
         des_xcbc_encrypt(in,out,inl,ctx->c.desx_cbc.ks,
                 (des_cblock *)&(ctx->iv[0]),
                 &ctx->c.desx_cbc.inw,
                 &ctx->c.desx_cbc.outw,
                 ctx->encrypt);
+        return 1;
         }
 #endif