projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove 0 assignments.
[oweals/openssl.git]
/
crypto
/
evp
/
e_null.c
diff --git
a/crypto/evp/e_null.c
b/crypto/evp/e_null.c
index 488add499d2b963d2c694d8a3f307ec1bd62a27f..b9502ebd2f0659d86a66f38501a9df1629eccda8 100644
(file)
--- a/
crypto/evp/e_null.c
+++ b/
crypto/evp/e_null.c
@@
-57,7
+57,7
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
-#include "cryptlib.h"
+#include "
internal/
cryptlib.h"
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
@@
-86,7
+86,6
@@
const EVP_CIPHER *EVP_enc_null(void)
static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const 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)); */
return 1;
}
return 1;
}
@@
-94,6
+93,6
@@
static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
const unsigned char *in, size_t inl)
{
if (in != out)
const unsigned char *in, size_t inl)
{
if (in != out)
- memcpy(
(char *)out, (const char *)
in, inl);
+ memcpy(
out,
in, inl);
return 1;
}
return 1;
}