projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up EVP macros, rename DES EDE3 modes correctly, temporary support for
[oweals/openssl.git]
/
crypto
/
evp
/
e_bf.c
diff --git
a/crypto/evp/e_bf.c
b/crypto/evp/e_bf.c
index 5f6b0f933f8557d7e3506c7ee1f18301b5db0894..e9a19d57d2b0cd5f069d947d131460898624d052 100644
(file)
--- a/
crypto/evp/e_bf.c
+++ b/
crypto/evp/e_bf.c
@@
-56,22
+56,22
@@
* [including the GNU Public Licence.]
*/
* [including the GNU Public Licence.]
*/
-#ifndef NO_BF
+#ifndef
OPENSSL_
NO_BF
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/evp.h>
#include "evp_locl.h"
#include <openssl/objects.h>
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/evp.h>
#include "evp_locl.h"
#include <openssl/objects.h>
-static int bf_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
-
unsigned char *iv,
int enc);
+static int bf_init_key(EVP_CIPHER_CTX *ctx,
const
unsigned char *key,
+
const unsigned char *iv,
int enc);
IMPLEMENT_BLOCK_CIPHER(bf, bf_ks, BF, bf_ks, NID_bf, 8, 16, 8,
IMPLEMENT_BLOCK_CIPHER(bf, bf_ks, BF, bf_ks, NID_bf, 8, 16, 8,
-
0
, bf_init_key, NULL,
+
EVP_CIPH_VARIABLE_LENGTH
, bf_init_key, NULL,
EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)
EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)
-static int bf_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
- unsigned char *iv, int enc)
+static int bf_init_key(EVP_CIPHER_CTX *ctx,
const
unsigned char *key,
+
const
unsigned char *iv, int enc)
{
BF_set_key(&(ctx->c.bf_ks),EVP_CIPHER_CTX_key_length(ctx),key);
return 1;
{
BF_set_key(&(ctx->c.bf_ks),EVP_CIPHER_CTX_key_length(ctx),key);
return 1;