Portability patch for HP MPE/iX. Submitted by Mark Bixby <mark_bixby@hp.com>

[oweals/openssl.git] / crypto / evp / e_xcbc_d.c

diff --git a/crypto/evp/e_xcbc_d.c b/crypto/evp/e_xcbc_d.c
index 067b721a0f5dfa066270053690f5f82796771bae..e5b15acc7d4171081888b0055686ea8c7bbc144d 100644 (file)
--- a/crypto/evp/e_xcbc_d.c
+++ b/crypto/evp/e_xcbc_d.c
@@ -62,10 +62,10 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 
-static int 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);
 static int desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-       unsigned char *in, unsigned int inl);
+                          const unsigned char *in, unsigned int inl);
 static EVP_CIPHER d_xcbc_cipher=
        {
        NID_desx_cbc,
@@ -86,25 +86,20 @@ EVP_CIPHER *EVP_desx_cbc(void)
        return(&d_xcbc_cipher);
        }
        
-static int 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 int desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-            unsigned char *in, unsigned int inl)
+                          const unsigned char *in, unsigned int inl)
        {
        des_xcbc_encrypt(in,out,inl,ctx->c.desx_cbc.ks,
                (des_cblock *)&(ctx->iv[0]),