diff options
author | Darren Tucker <dtucker@zip.com.au> | 2007-06-14 23:21:32 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2007-06-14 23:21:32 +1000 |
commit | cb52017ad9024e4d72766a19f286addcdafc2374 (patch) | |
tree | 739207c3be6c98d5efab88fbfdd93a403c1b568c /umac.c | |
parent | bed63112f5a1f52b255f03bc2f457eaab5001e0c (diff) | |
download | openssh-git-cb52017ad9024e4d72766a19f286addcdafc2374.tar.gz |
- (dtucker) [cipher-ctr.c umac.c openbsd-compat/openssl-compat.h] Move the
USE_BUILTIN_RIJNDAEL compat goop to openssl-compat.h so it can be
shared with umac.c. Allows building with OpenSSL 0.9.5 again including
umac support. With tim@ djm@, ok djm.
Diffstat (limited to 'umac.c')
-rw-r--r-- | umac.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -165,7 +165,10 @@ static void STORE_UINT32_REVERSED(void *ptr, UINT32 x) #define AES_BLOCK_LEN 16 /* OpenSSL's AES */ -#include <openssl/aes.h> +#include "openbsd-compat/openssl-compat.h" +#ifndef USE_BUILTIN_RIJNDAEL +# include <openssl/aes.h> +#endif typedef AES_KEY aes_int_key[1]; #define aes_encryption(in,out,int_key) \ AES_encrypt((u_char *)(in),(u_char *)(out),(AES_KEY *)int_key) |