[asterisk-commits] tilghman: branch 1.6.0 r220587 - in /branches/1.6.0: ./ include/asterisk/aes.h

[SVN commits to the Asterisk project]

Author: tilghman
Date: Sat Sep 26 10:11:23 2009
New Revision: 220587

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=220587
Log:
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.
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/aes.h

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/include/asterisk/aes.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/include/asterisk/aes.h?view=diff&rev=220587&r1=220586&r2=220587
==============================================================================
--- branches/1.6.0/include/asterisk/aes.h (original)
+++ branches/1.6.0/include/asterisk/aes.h Sat Sep 26 10:11:23 2009
@@ -49,6 +49,7 @@
 
 /* Use the included AES implementation */
 
+#define AES_128
 #include "aes_internal.h"
 
 typedef aes_encrypt_ctx ast_aes_encrypt_key;