projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix mkerr.pl to find functions returning function pointers (thanks Ulf!)
[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 c67706e3a093ff7fac3514b8c89bee5aa44b07e8..e97368142b1216d3427fe76abd5f4702a4a5e3b5 100644
(file)
--- a/
crypto/evp/e_cbc_d.c
+++ b/
crypto/evp/e_cbc_d.c
@@
-58,8
+58,8
@@
#include <stdio.h>
#include "cryptlib.h"
#include <stdio.h>
#include "cryptlib.h"
-#include
"evp.h"
-#include
"objects.h"
+#include
<openssl/evp.h>
+#include
<openssl/objects.h>
#ifndef NOPROTO
static void des_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
#ifndef NOPROTO
static void des_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
@@
-84,33
+84,23
@@
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);
memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
if (key != NULL)
{
if (iv != NULL)
memcpy(&(ctx->oiv[0]),iv,8);
memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
if (key != NULL)
- des_set_key(
(des_cblock *)
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(
- (des_cblock *)in,(des_cblock *)out,
- (long)inl, ctx->c.des_ks,
- (des_cblock *)&(ctx->iv[0]),
- ctx->encrypt);
+ des_ncbc_encrypt(in,out,inl,ctx->c.des_ks,&(ctx->iv[0]),ctx->encrypt);
}
}