diff options
Diffstat (limited to 'crypto/evp/e_cbc_d.c')
| -rw-r--r-- | crypto/evp/e_cbc_d.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crypto/evp/e_cbc_d.c b/crypto/evp/e_cbc_d.c index ae9d25aca1..817d354358 100644 --- a/crypto/evp/e_cbc_d.c +++ b/crypto/evp/e_cbc_d.c @@ -62,9 +62,9 @@ #include <openssl/evp.h> #include <openssl/objects.h> -static void des_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, +static int des_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, unsigned char *iv,int enc); -static void des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, +static int des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, unsigned char *in, unsigned int inl); static EVP_CIPHER d_cbc_cipher= { @@ -86,7 +86,7 @@ EVP_CIPHER *EVP_des_cbc(void) return(&d_cbc_cipher); } -static void des_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, +static int des_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, unsigned char *iv, int enc) { des_cblock *deskey = (des_cblock *)key; @@ -96,13 +96,15 @@ static void des_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8); if (deskey != NULL) des_set_key_unchecked(deskey,ctx->c.des_ks); + return 1; } -static void des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, +static int des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, unsigned char *in, unsigned int inl) { des_ncbc_encrypt(in,out,inl,ctx->c.des_ks, (des_cblock *)&(ctx->iv[0]), ctx->encrypt); + return 1; } #endif |