Authentication digest-md5 is working (No leak, clear password)

diff --git a/lib/lvleml.c b/lib/lvleml.c
index 6229a318d897e2ff85e5821063f54417c041bf92..28a661ac46262e341e585f068f374b1c2110134b 100644 (file)
--- a/lib/lvleml.c
+++ b/lib/lvleml.c
@@ -633,7 +633,7 @@ char answer[300];
 int phase;
 _Bool proceed;
 
-tmppass="bigre";  //JMPDBG need to be improved
+tmppass=(char *)0;
 *rmtpass=strdup("$1(ukn as digest_md5)");
 challenge=(char *)0;
 resp=(RSPTYP *)0;
@@ -680,15 +680,25 @@ while (proceed==true) {
       if ((resp=dig_parseresp(answer))==(RSPTYP *)0)
         phase=999;      //Unable to parse answer
       break;
-    case 4      :  {    //getting the user name and password
+    case 4      :       //checking if we have a user name
+      if (resp->username==(char *)0) {
+        (void) rou_alert(0,"%s No username in challenge answer!",OPEP);
+        phase=999;      //Unable to parse answer
+        }
+      break;
+    case 5      :  {    //getting the user name and password
       USRTYP *usr;
 
+      contact->authname=rou_freestr(contact->authname);
+      contact->authname=strdup(resp->username);
       if (sql_mngusr(contact->sqlptr,sql_select,resp->username,&usr)==true) {
+        if (usr->passwd!=(char *)0) 
+          tmppass=strdup(usr->passwd);
         usr=sql_freeusr(usr);
         }
       }
       break;
-    case 5      :  {    //sending the rspauth sequence.
+    case 6      :  {    //sending the rspauth sequence.
       char *HAS;
       char *rspauth;
       char *b64;
@@ -704,7 +714,7 @@ while (proceed==true) {
       HAS=rou_freestr(HAS);
       }
       break;
-    case 6      :  {    //waiting client to send an empty line
+    case 7      :  {    //waiting client to send an empty line
       char *line;
       int count;
 
@@ -716,7 +726,7 @@ while (proceed==true) {
       line=rou_freestr(line);      //EMPTY Line!
       }
       break;
-    case 7      :  {    //comparing result.
+    case 8      :  {    //comparing result.
       char *HA0;
 
       if ((HA0=dig_hashresp(resp,"AUTHENTICATE",tmppass))==(char *)0) {
@@ -733,6 +743,7 @@ while (proceed==true) {
     }
   phase++;
   }
+tmppass=rou_freestr(tmppass);
 resp=dig_freeresp(resp);
 challenge=rou_freestr(challenge);