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_null.c
diff --git
a/crypto/evp/e_null.c
b/crypto/evp/e_null.c
index e4e7ca76066fc7d502f44917a5f801f5e748f0f4..db31fb9f08ad6663a2a489d3144527fdcae5383e 100644
(file)
--- a/
crypto/evp/e_null.c
+++ b/
crypto/evp/e_null.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 null_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
#ifndef NOPROTO
static void null_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
@@
-83,25
+83,19
@@
static EVP_CIPHER n_cipher=
NULL,
};
NULL,
};
-EVP_CIPHER *EVP_enc_null()
+EVP_CIPHER *EVP_enc_null(
void
)
{
return(&n_cipher);
}
{
return(&n_cipher);
}
-static void null_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void null_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+ unsigned char *iv, int enc)
{
memset(&(ctx->c),0,sizeof(ctx->c));
}
{
memset(&(ctx->c),0,sizeof(ctx->c));
}
-static void null_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+ unsigned char *in, unsigned int inl)
{
if (in != out)
memcpy((char *)out,(char *)in,(int)inl);
{
if (in != out)
memcpy((char *)out,(char *)in,(int)inl);