diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-21 19:11:32 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-21 19:11:32 +0000 |
| commit | 15f42844eff69ae1f2576497c2653a7423f42395 (patch) | |
| tree | 702c8203da791c3e168d1a0ef5d07dbafea3dd54 /pbx | |
| parent | fe09035019d8f513addec09466170dfc180a1de3 (diff) | |
Remove built-in AES code and use optional_api instead
Review: https://reviewboard.asterisk.org/r/793/
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@278538 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/dundi-parser.h | 2 | ||||
| -rw-r--r-- | pbx/pbx_dundi.c | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pbx/dundi-parser.h b/pbx/dundi-parser.h index 69a717e6f..b24d486a0 100644 --- a/pbx/dundi-parser.h +++ b/pbx/dundi-parser.h @@ -13,7 +13,7 @@ #define _DUNDI_PARSER_H #include "asterisk/dundi.h" -#include "asterisk/aes.h" +#include "asterisk/crypto.h" #define DUNDI_MAX_STACK 512 #define DUNDI_MAX_ANSWERS 100 diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index 420af27f8..aaa30da0c 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -61,7 +61,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/crypto.h" #include "asterisk/astdb.h" #include "asterisk/acl.h" -#include "asterisk/aes.h" #include "asterisk/app.h" #include "dundi-parser.h" @@ -1313,8 +1312,8 @@ static int update_key(struct dundi_peer *peer) int res; if (!peer->keyexpire || (peer->keyexpire < time(NULL))) { build_iv(key); - ast_aes_encrypt_key(key, &peer->us_ecx); - ast_aes_decrypt_key(key, &peer->us_dcx); + ast_aes_set_encrypt_key(key, &peer->us_ecx); + ast_aes_set_decrypt_key(key, &peer->us_dcx); ekey = ast_key_get(peer->inkey, AST_KEY_PUBLIC); if (!ekey) { ast_log(LOG_NOTICE, "No such key '%s' for creating RSA encrypted shared key for '%s'!\n", @@ -1516,8 +1515,8 @@ static int check_key(struct dundi_peer *peer, unsigned char *newkey, unsigned ch memcpy(peer->rxenckey, newkey, 128); memcpy(peer->rxenckey + 128, newsig, 128); peer->them_keycrc32 = crc32(0L, peer->rxenckey, 128); - ast_aes_decrypt_key(dst, &peer->them_dcx); - ast_aes_encrypt_key(dst, &peer->them_ecx); + ast_aes_set_decrypt_key(dst, &peer->them_dcx); + ast_aes_set_encrypt_key(dst, &peer->them_ecx); return 1; } |