Changeset 54 for pjproject/trunk/pjsip/src/pjsip/sip_auth.c

Timestamp:

Nov 18, 2005 10:43:42 PM (17 years ago)

Author:

bennylp

Message:

The BIG transport modifications

File:

• pjproject/trunk/pjsip/src/pjsip/sip_auth.c (modified) (9 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_auth.c

@@ -36 +36 @@
 
 /* A macro just to get rid of type mismatch between char and unsigned char */
-#define MD5_APPEND(pms,buf,len) md5_append(pms, (const unsigned char*)buf, len)
+#define MD5_APPEND(pms,buf,len) pj_md5_update(pms, (const pj_uint8_t*)buf, len)
 
 /* Logging. */
@@ -81 +81 @@
     char ha2[MD5STRLEN];
     unsigned char digest[16];
-    md5_state_t pms;
+    pj_md5_context pms;
 
     pj_assert(result->slen >= MD5STRLEN);
@@ -91 +91 @@
          *** ha1 = MD5(username ":" realm ":" password) 
          ***/
-        md5_init(&pms);
+        pj_md5_init(&pms);
         MD5_APPEND( &pms, cred_info->username.ptr, cred_info->username.slen);
         MD5_APPEND( &pms, ":", 1);
@@ -97 +97 @@
         MD5_APPEND( &pms, ":", 1);
         MD5_APPEND( &pms, cred_info->data.ptr, cred_info->data.slen);
-        md5_finish(&pms, digest);
+        pj_md5_final(&pms, digest);
 
         digest2str(digest, ha1);
@@ -111 +111 @@
      *** ha2 = MD5(method ":" req_uri) 
      ***/
-    md5_init(&pms);
+    pj_md5_init(&pms);
     MD5_APPEND( &pms, method->ptr, method->slen);
     MD5_APPEND( &pms, ":", 1);
     MD5_APPEND( &pms, uri->ptr, uri->slen);
-    md5_finish(&pms, digest);
+    pj_md5_final(&pms, digest);
     digest2str(digest, ha2);
 
@@ -127 +127 @@
      ***    response = MD5(ha1 ":" nonce ":" nc ":" cnonce ":" qop ":" ha2)
      ***/
-    md5_init(&pms);
+    pj_md5_init(&pms);
     MD5_APPEND( &pms, ha1, MD5STRLEN);
     MD5_APPEND( &pms, ":", 1);
@@ -143 +143 @@
 
     /* This is the final response digest. */
-    md5_finish(&pms, digest);
+    pj_md5_final(&pms, digest);
     
     /* Convert digest to string and store in chal->response. */
@@ -735 +735 @@
     PJ_UNUSED_ARG(endpt);
 
-    pj_assert(rdata->msg->type == PJSIP_RESPONSE_MSG);
-    pj_assert(rdata->msg->line.status.code == 401 ||
-              rdata->msg->line.status.code == 407 );
+    pj_assert(rdata->msg_info.msg->type == PJSIP_RESPONSE_MSG);
+    pj_assert(rdata->msg_info.msg->line.status.code == 401 ||
+              rdata->msg_info.msg->line.status.code == 407 );
 
     /*
      * Respond to each authentication challenge.
      */
-    hdr = rdata->msg->hdr.next;
-    while (hdr != &rdata->msg->hdr) {
+    hdr = rdata->msg_info.msg->hdr.next;
+    while (hdr != &rdata->msg_info.msg->hdr) {
         pjsip_auth_session *sess;
         const pjsip_www_authenticate_hdr *hchal;
@@ -751 +751 @@
         while (hdr->type != PJSIP_H_WWW_AUTHENTICATE &&
                hdr->type != PJSIP_H_PROXY_AUTHENTICATE &&
-               hdr != &rdata->msg->hdr)
+               hdr != &rdata->msg_info.msg->hdr)
         {
             hdr = hdr->next;
         }
-        if (hdr == &rdata->msg->hdr)
+        if (hdr == &rdata->msg_info.msg->hdr)
             break;