From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sat, 26 Sep 2009 15:12:49 +0000 (+0000)
Subject: Merged revisions 220586 via svnmerge from
X-Git-Tag: 1.6.1.7-rc2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb27e46c7395864e918ae3b97febe56d7cf9383a;p=thirdparty%2Fasterisk.git

Merged revisions 220586 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r220586 | tilghman | 2009-09-26 10:10:28 -0500 (Sat, 26 Sep 2009) | 2 lines

  Allow AES to compile, when OpenSSL is not present.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@220588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/aes.h b/include/asterisk/aes.h
index 4a85669d04..2476aaa555 100644
--- a/include/asterisk/aes.h
+++ b/include/asterisk/aes.h
@@ -49,6 +49,7 @@ typedef AES_KEY ast_aes_decrypt_key;
 
 /* Use the included AES implementation */
 
+#define AES_128
 #include "aes_internal.h"
 
 typedef aes_encrypt_ctx ast_aes_encrypt_key;