projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change functions to ANSI C.
[openssl.git]
/
crypto
/
evp
/
e_cbc_d.c
diff --git
a/crypto/evp/e_cbc_d.c
b/crypto/evp/e_cbc_d.c
index f18c8c7e0745e78a01ac398ab449a66d8daaa847..eb7a24f3cf67349a70baa6ca96a0529bde4487e3 100644
(file)
--- a/
crypto/evp/e_cbc_d.c
+++ b/
crypto/evp/e_cbc_d.c
@@
-84,16
+84,13
@@
static EVP_CIPHER d_cbc_cipher=
EVP_CIPHER_set_asn1_iv,
};
EVP_CIPHER_set_asn1_iv,
};
-EVP_CIPHER *EVP_des_cbc()
+EVP_CIPHER *EVP_des_cbc(
void
)
{
return(&d_cbc_cipher);
}
{
return(&d_cbc_cipher);
}
-static void des_cbc_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void des_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+ unsigned char *iv, int enc)
{
if (iv != NULL)
memcpy(&(ctx->oiv[0]),iv,8);
{
if (iv != NULL)
memcpy(&(ctx->oiv[0]),iv,8);
@@
-102,11
+99,8
@@
int enc;
des_set_key(key,ctx->c.des_ks);
}
des_set_key(key,ctx->c.des_ks);
}
-static void des_cbc_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void 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,&(ctx->iv[0]),ctx->encrypt);
}
{
des_ncbc_encrypt(in,out,inl,ctx->c.des_ks,&(ctx->iv[0]),ctx->encrypt);
}