diff options
Diffstat (limited to 'crypto/evp/e_cbc_3d.c')
| -rw-r--r-- | crypto/evp/e_cbc_3d.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/crypto/evp/e_cbc_3d.c b/crypto/evp/e_cbc_3d.c index a458921583..7ee7851c55 100644 --- a/crypto/evp/e_cbc_3d.c +++ b/crypto/evp/e_cbc_3d.c @@ -62,11 +62,11 @@ #include <openssl/evp.h> #include <openssl/objects.h> -static void des_cbc_ede_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, +static int 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, +static int 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, +static int des_cbc_ede_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, unsigned char *in, unsigned int inl); static EVP_CIPHER d_cbc_ede_cipher2= { @@ -108,7 +108,7 @@ EVP_CIPHER *EVP_des_ede3_cbc(void) return(&d_cbc_ede_cipher3); } -static void des_cbc_ede_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, +static int des_cbc_ede_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, unsigned char *iv, int enc) { des_cblock *deskey = (des_cblock *)key; @@ -125,9 +125,10 @@ static void des_cbc_ede_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_cbc_ede3_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, +static int des_cbc_ede3_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, unsigned char *iv, int enc) { des_cblock *deskey = (des_cblock *)key; @@ -142,14 +143,16 @@ static void des_cbc_ede3_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_cbc_ede_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, +static int des_cbc_ede_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, unsigned char *in, unsigned int inl) { 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]), ctx->encrypt); + return 1; } #endif |