diff options
author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-13 20:48:47 +0000 |
---|---|---|
committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-13 20:48:47 +0000 |
commit | 04402edd3377e0cd78d1fbd6bcef75499d044938 (patch) | |
tree | e44c756f1308145caf8af6fe658e4cdd44ccf76f /channels/iax2.h | |
parent | 3f20910dd9914e9d59e84089cefae6984cbb7148 (diff) |
Merged revisions 175597 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r175597 | dvossel | 2009-02-13 14:11:55 -0600 (Fri, 13 Feb 2009) | 4 lines
Fixed iax2 key rotation backwards compatibility
Turns key rotation back on by default. Added bit into encryption IE to indicate whether or not key rotation is supported or not. If it is not supported then it is not enabled, which insures backwards compatibility. This eliminates the need for the keyrotate option in iax.conf, so it has been removed.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@175662 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/iax2.h')
-rw-r--r-- | channels/iax2.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/iax2.h b/channels/iax2.h index 98e7480db..2b79e91d0 100644 --- a/channels/iax2.h +++ b/channels/iax2.h @@ -187,6 +187,7 @@ enum { #define IAX_AUTH_RSA (1 << 2) #define IAX_ENCRYPT_AES128 (1 << 0) +#define IAX_ENCRYPT_KEYROTATE (1 << 15) /*!< Keyrotation support */ #define IAX_META_TRUNK 1 /*!< Trunk meta-message */ #define IAX_META_VIDEO 2 /*!< Video frame */ |