projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change #include filenames from <foo.h> to <openssl.h>.
[openssl.git]
/
crypto
/
evp
/
e_cfb_r2.c
diff --git
a/crypto/evp/e_cfb_r2.c
b/crypto/evp/e_cfb_r2.c
index af5a39d1f4ab3b95a871e7dd7102c54771fbf742..68c4eba96913e0761972266c2abeb73d78517967 100644
(file)
--- a/
crypto/evp/e_cfb_r2.c
+++ b/
crypto/evp/e_cfb_r2.c
@@
-60,8
+60,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 rc2_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
#ifndef NOPROTO
static void rc2_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
@@
-86,16
+86,13
@@
static EVP_CIPHER r2_cfb_cipher=
EVP_CIPHER_get_asn1_iv,
};
EVP_CIPHER_get_asn1_iv,
};
-EVP_CIPHER *EVP_rc2_cfb()
+EVP_CIPHER *EVP_rc2_cfb(
void
)
{
return(&r2_cfb_cipher);
}
{
return(&r2_cfb_cipher);
}
-static void rc2_cfb_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void rc2_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+ unsigned char *iv, int enc)
{
ctx->num=0;
{
ctx->num=0;
@@
-103,15
+100,12
@@
int enc;
memcpy(&(ctx->oiv[0]),iv,8);
memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
if (key != NULL)
memcpy(&(ctx->oiv[0]),iv,8);
memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
if (key != NULL)
- RC2_set_key(&(ctx->c.rc2_ks),EVP_
RC2_KEY_SIZE,key
,
-
EVP_RC2_KEY_SIZE
*8);
+ RC2_set_key(&(ctx->c.rc2_ks),EVP_
CIPHER_CTX_key_length(ctx)
,
+
key,EVP_CIPHER_CTX_key_length(ctx)
*8);
}
}
-static void rc2_cfb_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void rc2_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+ unsigned char *in, unsigned int inl)
{
RC2_cfb64_encrypt(
in,out,
{
RC2_cfb64_encrypt(
in,out,