]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 220586 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Sat, 26 Sep 2009 15:12:49 +0000 (15:12 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Sat, 26 Sep 2009 15:12:49 +0000 (15:12 +0000)
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

include/asterisk/aes.h

index 4a85669d043e81c2d78e9c39aebd89334b0f52d9..2476aaa5555ac2b462e946b97dffaea0858c4ea3 100644 (file)
@@ -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;