projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove FIPS module code from crypto/evp
[openssl.git]
/
crypto
/
evp
/
e_null.c
diff --git
a/crypto/evp/e_null.c
b/crypto/evp/e_null.c
index d507337df64389f2ad6433991aba530dd30ac474..4612db3df84c06c81af736e96bd2dd1a7e2ee156 100644
(file)
--- a/
crypto/evp/e_null.c
+++ b/
crypto/evp/e_null.c
@@
-61,41
+61,40
@@
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
-static int null_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
- unsigned char *iv,int enc);
+static int null_init_key(EVP_CIPHER_CTX *ctx,
const
unsigned char *key,
+
const
unsigned char *iv,int enc);
static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-
unsigned char *in, unsigned in
t inl);
-static EVP_CIPHER n_cipher=
+
const unsigned char *in, size_
t inl);
+static
const
EVP_CIPHER n_cipher=
{
NID_undef,
{
NID_undef,
- 1,0,0,
- 0,
+ 1,0,0,0,
null_init_key,
null_cipher,
NULL,
0,
NULL,
NULL,
null_init_key,
null_cipher,
NULL,
0,
NULL,
NULL,
+ NULL,
NULL
};
NULL
};
-EVP_CIPHER *EVP_enc_null(void)
+
const
EVP_CIPHER *EVP_enc_null(void)
{
return(&n_cipher);
}
{
return(&n_cipher);
}
-static int null_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
- unsigned char *iv, int enc)
+static int null_init_key(EVP_CIPHER_CTX *ctx,
const
unsigned char *key,
+
const
unsigned char *iv, int enc)
{
{
- memset(&(ctx->c),0,sizeof(ctx->c));
+ /* memset(&(ctx->c),0,sizeof(ctx->c));*/
return 1;
}
static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
return 1;
}
static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-
unsigned char *in, unsigned in
t inl)
+
const unsigned char *in, size_
t inl)
{
if (in != out)
{
if (in != out)
- memcpy((char *)out,(c
har *)in,(int)
inl);
+ memcpy((char *)out,(c
onst char *)in,
inl);
return 1;
}
return 1;
}
-