diff options
author | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
commit | 9b71add4cecf753c45f5fbd6ff0913bc95b3e95d (patch) | |
tree | d4ea8fdb30c7949c6433f5277c39548ea579d4dc /cipher-acss.c | |
parent | ed07bcbea56007ab5b218ddf3aa6a7d4e21966e0 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
Merge 4.2p1 to the trunk.
Diffstat (limited to 'cipher-acss.c')
-rw-r--r-- | cipher-acss.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cipher-acss.c b/cipher-acss.c index 3a966a74d..a95fa6747 100644 --- a/cipher-acss.c +++ b/cipher-acss.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | #include <openssl/evp.h> | 18 | #include <openssl/evp.h> |
19 | 19 | ||
20 | RCSID("$Id: cipher-acss.c,v 1.2 2004/02/06 04:26:11 dtucker Exp $"); | 20 | RCSID("$Id: cipher-acss.c,v 1.3 2005/07/17 07:04:47 djm Exp $"); |
21 | 21 | ||
22 | #if !defined(EVP_CTRL_SET_ACSS_MODE) && (OPENSSL_VERSION_NUMBER >= 0x00907000L) | 22 | #if !defined(EVP_CTRL_SET_ACSS_MODE) && (OPENSSL_VERSION_NUMBER >= 0x00907000L) |
23 | 23 | ||
@@ -33,7 +33,7 @@ typedef struct { | |||
33 | #define EVP_CTRL_SET_ACSS_SUBKEY 0xff07 | 33 | #define EVP_CTRL_SET_ACSS_SUBKEY 0xff07 |
34 | 34 | ||
35 | static int | 35 | static int |
36 | acss_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | 36 | acss_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, |
37 | const unsigned char *iv, int enc) | 37 | const unsigned char *iv, int enc) |
38 | { | 38 | { |
39 | acss_setkey(&data(ctx)->ks,key,enc,ACSS_DATA); | 39 | acss_setkey(&data(ctx)->ks,key,enc,ACSS_DATA); |
@@ -41,7 +41,7 @@ acss_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | |||
41 | } | 41 | } |
42 | 42 | ||
43 | static int | 43 | static int |
44 | acss_ciph(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, | 44 | acss_ciph(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, |
45 | unsigned int inl) | 45 | unsigned int inl) |
46 | { | 46 | { |
47 | acss(&data(ctx)->ks,inl,in,out); | 47 | acss(&data(ctx)->ks,inl,in,out); |