diff options
| author | Colin Watson <cjwatson@debian.org> | 2011-01-24 11:46:57 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2011-01-24 11:46:57 +0000 |
| commit | 0970072c89b079b022538e3c366fbfa2c53fc821 (patch) | |
| tree | b7024712d74234bb5a8b036ccbc9109e2e211296 /cipher-aes.c | |
| parent | 4e8aa4da57000c7bba8e5c49163bc0c0ca383f78 (diff) | |
| parent | 478ff799463ca926a8dfbabf058f4e84aaffc65a (diff) | |
merge 5.7p1
Diffstat (limited to 'cipher-aes.c')
| -rw-r--r-- | cipher-aes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cipher-aes.c b/cipher-aes.c index 3ea594969..bfda6d2f2 100644 --- a/cipher-aes.c +++ b/cipher-aes.c | |||
| @@ -72,7 +72,7 @@ ssh_rijndael_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv, | |||
| 72 | 72 | ||
| 73 | static int | 73 | static int |
| 74 | ssh_rijndael_cbc(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src, | 74 | ssh_rijndael_cbc(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src, |
| 75 | u_int len) | 75 | LIBCRYPTO_EVP_INL_TYPE len) |
| 76 | { | 76 | { |
| 77 | struct ssh_rijndael_ctx *c; | 77 | struct ssh_rijndael_ctx *c; |
| 78 | u_char buf[RIJNDAEL_BLOCKSIZE]; | 78 | u_char buf[RIJNDAEL_BLOCKSIZE]; |