From c1d85c851c8e9892a46d48381bab249492bdf423 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Wed, 10 Oct 2007 12:18:27 +0000 Subject: Continuing ticket #396: added PJSIP_HAS_DIGEST_AKAv1_AUTH to enable AKA support. Default is disabled, for now git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1489 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip/include/pjsip/sip_config.h | 10 ++++++++++ pjsip/src/pjsip/sip_auth_aka.c | 5 +++++ pjsip/src/pjsip/sip_auth_client.c | 6 ++++++ 3 files changed, 21 insertions(+) diff --git a/pjsip/include/pjsip/sip_config.h b/pjsip/include/pjsip/sip_config.h index 3d386097..82af631b 100644 --- a/pjsip/include/pjsip/sip_config.h +++ b/pjsip/include/pjsip/sip_config.h @@ -615,6 +615,16 @@ #endif +/** + * Specify support for IMS/3GPP digest AKA authentication. + * + * Default: 0 (disabled for now) + */ +#ifndef PJSIP_HAS_DIGEST_AKAV1_AUTH +# define PJSIP_HAS_DIGEST_AKAV1_AUTH 0 +#endif + + /** * @} */ diff --git a/pjsip/src/pjsip/sip_auth_aka.c b/pjsip/src/pjsip/sip_auth_aka.c index b88ddb7c..a055d3cb 100644 --- a/pjsip/src/pjsip/sip_auth_aka.c +++ b/pjsip/src/pjsip/sip_auth_aka.c @@ -25,6 +25,8 @@ #include #include +#if PJSIP_HAS_DIGEST_AKAV1_AUTH + #include "../../third_party/milenage/milenage.h" /* @@ -119,3 +121,6 @@ PJ_DEF(pj_status_t) pjsip_auth_create_akav1( pj_pool_t *pool, return PJ_SUCCESS; } + +#endif /* PJSIP_HAS_DIGEST_AKAV1_AUTH */ + diff --git a/pjsip/src/pjsip/sip_auth_client.c b/pjsip/src/pjsip/sip_auth_client.c index 88cd3e94..0a3049e2 100644 --- a/pjsip/src/pjsip/sip_auth_client.c +++ b/pjsip/src/pjsip/sip_auth_client.c @@ -469,6 +469,12 @@ PJ_DEF(pj_status_t) pjsip_auth_clt_set_credentials( pjsip_auth_clt_sess *sess, * callback must be specified. */ if ((c[i].data_type & EXT_MASK) == PJSIP_CRED_DATA_EXT_AKA) { + +#if !PJSIP_HAS_DIGEST_AKAV1_AUTH + pj_assert(!"PJSIP_HAS_DIGEST_AKAV1_AUTH is not enabled"); + return PJSIP_EAUTHINAKACRED; +#endif + /* Callback must be specified */ PJ_ASSERT_RETURN(c[i].ext.aka.cb != NULL, PJ_EINVAL); -- cgit v1.2.3