summaryrefslogtreecommitdiff
path: root/cipher-ctr.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2009-12-29 21:40:29 +0000
committerColin Watson <cjwatson@debian.org>2009-12-29 21:40:29 +0000
commita25ec0b132c44c9e341e08464ff830de06b81126 (patch)
treee20842d80f9e25cb6cf09525abea63f7bf655dd7 /cipher-ctr.c
parent1b816ea846aca3ee89e7995373ace609e9518424 (diff)
parent70847d299887abb96f8703ca99db6d817b78960e (diff)
import openssh-4.7p1-gsskex-20070927.patch
Diffstat (limited to 'cipher-ctr.c')
-rw-r--r--cipher-ctr.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/cipher-ctr.c b/cipher-ctr.c
index b24f3a428..3b86cc10b 100644
--- a/cipher-ctr.c
+++ b/cipher-ctr.c
@@ -29,13 +29,7 @@
29/* compatibility with old or broken OpenSSL versions */ 29/* compatibility with old or broken OpenSSL versions */
30#include "openbsd-compat/openssl-compat.h" 30#include "openbsd-compat/openssl-compat.h"
31 31
32#ifdef USE_BUILTIN_RIJNDAEL 32#ifndef USE_BUILTIN_RIJNDAEL
33#include "rijndael.h"
34#define AES_KEY rijndael_ctx
35#define AES_BLOCK_SIZE 16
36#define AES_encrypt(a, b, c) rijndael_encrypt(c, a, b)
37#define AES_set_encrypt_key(a, b, c) rijndael_set_key(c, (char *)a, b, 1)
38#else
39#include <openssl/aes.h> 33#include <openssl/aes.h>
40#endif 34#endif
41 35