Changeset 1500 for pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c

Timestamp:

Oct 15, 2007 7:04:59 AM (17 years ago)

Author:

bennylp

Message:

Continuing ticket #396: tested digest AKAv1, implemented AKAv2, and some works in the authentication framework to support it

File:

• pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c (modified) (7 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c

@@ -49 +49 @@
 
 
+static void dup_bin(pj_pool_t *pool, pj_str_t *dst, const pj_str_t *src)
+{
+    dst->slen = src->slen;
+
+    if (dst->slen) {
+        dst->ptr = (char*) pj_pool_alloc(pool, src->slen);
+        pj_memcpy(dst->ptr, src->ptr, src->slen);
+    } else {
+        dst->ptr = NULL;
+    }
+}
+
 PJ_DEF(void) pjsip_cred_info_dup(pj_pool_t *pool,
                                  pjsip_cred_info *dst,
@@ -61 +73 @@
 
     if ((dst->data_type & EXT_MASK) == PJSIP_CRED_DATA_EXT_AKA) {
-        pj_strdup(pool, &dst->ext.aka.k, &src->ext.aka.k);
-        pj_strdup(pool, &dst->ext.aka.op, &src->ext.aka.op);
-        pj_strdup(pool, &dst->ext.aka.amf, &src->ext.aka.amf);
+        dup_bin(pool, &dst->ext.aka.k, &src->ext.aka.k);
+        dup_bin(pool, &dst->ext.aka.op, &src->ext.aka.op);
+        dup_bin(pool, &dst->ext.aka.amf, &src->ext.aka.amf);
     }
 }
@@ -223 +235 @@
                                    const pj_str_t *method)
 {
-    /* Check algorithm is supported. We only support MD5. */
-    if (chal->algorithm.slen && pj_stricmp(&chal->algorithm, &pjsip_MD5_STR))
+    const pj_str_t pjsip_AKAv1_MD5_STR = { "AKAv1-MD5", 9 };
+
+    /* Check algorithm is supported. We support MD5 and AKAv1-MD5. */
+    if (chal->algorithm.slen==0 ||
+        (pj_stricmp(&chal->algorithm, &pjsip_MD5_STR) ||
+         pj_stricmp(&chal->algorithm, &pjsip_AKAv1_MD5_STR)))
     {
+        ;
+    }
+    else {
         PJ_LOG(4,(THIS_FILE, "Unsupported digest algorithm \"%.*s\"",
                   chal->algorithm.slen, chal->algorithm.ptr));
@@ -236 +255 @@
     pj_strdup(pool, &cred->nonce, &chal->nonce);
     pj_strdup(pool, &cred->uri, uri);
-    cred->algorithm = pjsip_MD5_STR;
+    pj_strdup(pool, &cred->algorithm, &chal->algorithm);
     pj_strdup(pool, &cred->opaque, &chal->opaque);
-    
+
     /* Allocate memory. */
     cred->response.ptr = (char*) pj_pool_alloc(pool, PJSIP_MD5STRLEN);
@@ -471 +490 @@
             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");
+#if !PJSIP_HAS_DIGEST_AKA_AUTH
+                pj_assert(!"PJSIP_HAS_DIGEST_AKA_AUTH is not enabled");
                 return PJSIP_EAUTHINAKACRED;
 #endif
@@ -480 +499 @@
 
                 /* Verify K len */
-                PJ_ASSERT_RETURN(c[i].ext.aka.k.slen == PJSIP_AKA_KLEN, 
+                PJ_ASSERT_RETURN(c[i].ext.aka.k.slen <= PJSIP_AKA_KLEN, 
                                  PJSIP_EAUTHINAKACRED);
 
                 /* Verify OP len */
-                PJ_ASSERT_RETURN(c[i].ext.aka.op.slen == PJSIP_AKA_OPLEN, 
+                PJ_ASSERT_RETURN(c[i].ext.aka.op.slen <= PJSIP_AKA_OPLEN, 
                                  PJSIP_EAUTHINAKACRED);
 
                 /* Verify AMF len */
-                PJ_ASSERT_RETURN(c[i].ext.aka.amf.slen == PJSIP_AKA_AMFLEN,
+                PJ_ASSERT_RETURN(c[i].ext.aka.amf.slen <= PJSIP_AKA_AMFLEN,
                                  PJSIP_EAUTHINAKACRED);
 
@@ -793 +812 @@
                            &sent_auth->credential.common.realm )==0)
             {
-                break;
+                /* If this authorization has empty response, remove it. */
+                if (pj_stricmp(&sent_auth->scheme, &pjsip_DIGEST_STR)==0 &&
+                    sent_auth->credential.digest.response.slen == 0)
+                {
+                    /* This is empty authorization, remove it. */
+                    hdr = hdr->next;
+                    pj_list_erase(sent_auth);
+                    continue;
+                } else {
+                    /* Found previous authorization attempt */
+                    break;
+                }
             }
         }