summaryrefslogtreecommitdiffstats
path: root/crypto/evp/e_ofb_3d.c
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/evp/e_ofb_3d.c')
-rw-r--r--crypto/evp/e_ofb_3d.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/crypto/evp/e_ofb_3d.c b/crypto/evp/e_ofb_3d.c
index c1714fda8d..f8b3141935 100644
--- a/crypto/evp/e_ofb_3d.c
+++ b/crypto/evp/e_ofb_3d.c
@@ -62,11 +62,11 @@
#include <openssl/evp.h>
#include <openssl/objects.h>
-static void des_ede_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+static int des_ede_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
unsigned char *iv,int enc);
-static void des_ede3_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+static int des_ede3_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
unsigned char *iv,int enc);
-static void des_ede_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+static int des_ede_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
unsigned char *in, unsigned int inl);
static EVP_CIPHER d_ede_ofb_cipher2=
{
@@ -108,7 +108,7 @@ EVP_CIPHER *EVP_des_ede3_ofb(void)
return(&d_ede3_ofb_cipher3);
}
-static void des_ede_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+static int des_ede_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
unsigned char *iv, int enc)
{
des_cblock *deskey = (des_cblock *)key;
@@ -126,9 +126,10 @@ static void des_ede_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
(char *)ctx->c.des_ede.ks1,
sizeof(ctx->c.des_ede.ks1));
}
+ return 1;
}
-static void des_ede3_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+static int des_ede3_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
unsigned char *iv, int enc)
{
des_cblock *deskey = (des_cblock *)key;
@@ -144,13 +145,15 @@ static void des_ede3_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
des_set_key_unchecked(&deskey[1],ctx->c.des_ede.ks2);
des_set_key_unchecked(&deskey[2],ctx->c.des_ede.ks3);
}
+ return 1;
}
-static void des_ede_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+static int des_ede_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
unsigned char *in, unsigned int inl)
{
des_ede3_ofb64_encrypt(in,out,inl,ctx->c.des_ede.ks1,
ctx->c.des_ede.ks2, ctx->c.des_ede.ks3,
(des_cblock *)&(ctx->iv[0]),&ctx->num);
+ return 1;
}
#endif