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

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

diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c
index 0d31a6606147283f02f0c6555dc08f27c42ceb29..e0702cf818eeb5f88389a0d474258844e6179dd2 100644 (file)
--- a/crypto/evp/e_null.c
+++ b/crypto/evp/e_null.c
@@ -61,10 +61,10 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 
-static void null_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
-       unsigned char *iv,int enc);
-static void null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-       unsigned char *in, unsigned int inl);
+static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+       const unsigned char *iv,int enc);
+static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+       const unsigned char *in, unsigned int inl);
 static EVP_CIPHER n_cipher=
        {
        NID_undef,
@@ -84,16 +84,18 @@ EVP_CIPHER *EVP_enc_null(void)
        return(&n_cipher);
        }
 
-static void null_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
-            unsigned char *iv, int enc)
+static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+            const unsigned char *iv, int enc)
        {
        memset(&(ctx->c),0,sizeof(ctx->c));
+       return 1;
        }
 
-static void null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-            unsigned char *in, unsigned int inl)
+static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+            const unsigned char *in, unsigned int inl)
        {
        if (in != out)
                memcpy((char *)out,(char *)in,(int)inl);
+       return 1;
        }