Changeset 7cad7b4

Timestamp:

2005-12-08T16:00:08Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

87c24ba

Parents:

09adf08

Message:

Clearer seperation between crypting and generic password code

Files:

• commands.c (modified) (2 diffs)
• crypting.c (modified) (3 diffs)
• crypting.h (modified) (1 diff)
• irc.c (modified) (2 diffs)
• irc.h (modified) (1 diff)
• storage_text.c (modified) (2 diffs)

commands.c

@@ -114 +114 @@
         }
 
-        setpassnc( irc, cmd[1] );
+        irc_setpass( irc, cmd[1] );
         switch( global.storage->save( irc, FALSE )) {
                 case STORAGE_ALREADY_EXISTS:
@@ -145 +145 @@
                 return( 0 );
         case STORAGE_OK:
-                setpassnc( irc, NULL );
+                irc_setpass( irc, NULL );
                 irc_usermsg( irc, "Account `%s' removed", irc->nick );
                 return( 0 );

crypting.c

@@ -52 +52 @@
 #include <stdlib.h>
 
-#define irc_usermsg
-
 #endif
 
@@ -62 +60 @@
 \*/
 
-/* USE WITH CAUTION!
-   Sets pass without checking */
-void setpassnc (irc_t *irc, const char *pass) 
-{
-        if (irc->password) g_free (irc->password);
-        
-        if (pass) {
-                irc->password = g_strdup (pass);
-                irc_usermsg (irc, "Password successfully changed");
-        } else {
-                irc->password = NULL;
-        }
-}
-
-int setpass (irc_t *irc, const char *pass, const char* md5sum) 
+int checkpass (const char *pass, const char *md5sum)
 {
         md5_state_t md5state;
@@ -94 +78 @@
                 if (digits[1] != md5sum[j + 1]) return (-1);
         }
-        
-        /* If pass is correct, we end up here and we set the pass */
-        setpassnc (irc, pass);
-        
-        return (0);
-}
+
+        return( 0 );
+}
+
 
 char *hashpass (irc_t *irc) {

crypting.h

@@ -24 +24 @@
 */
 
-void setpassnc (irc_t *irc, const char *pass); /* USE WITH CAUTION! */
-int setpass (irc_t *irc, const char *pass, const char* md5sum);
+int checkpass (const char *password, const char *md5sum);
 char *hashpass (irc_t *irc);
 char *obfucrypt (irc_t *irc, char *line);

irc.c

@@ -32 +32 @@
 GSList *irc_connection_list = NULL;
 
-char *passchange (irc_t *irc, void *set, char *value) 
-{
-        setpassnc (irc, value);
+static char *passchange (irc_t *irc, void *set, char *value) 
+{
+        irc_setpass (irc, value);
         return (NULL);
 }
@@ -266 +266 @@
         if( global.conf->runmode == RUNMODE_INETD )
                 g_main_quit( global.loop );
+}
+
+/* USE WITH CAUTION!
+   Sets pass without checking */
+void irc_setpass (irc_t *irc, const char *pass) 
+{
+        if (irc->password) g_free (irc->password);
+        
+        if (pass) {
+                irc->password = g_strdup (pass);
+                irc_usermsg (irc, "Password successfully changed");
+        } else {
+                irc->password = NULL;
+        }
 }
 

irc.h

@@ -137 +137 @@
 void irc_whois( irc_t *irc, char *nick );
 int irc_away( irc_t *irc, char *away );
+void irc_setpass( irc_t *irc, const char *pass ); /* USE WITH CAUTION! */
 
 int irc_send( irc_t *irc, char *nick, char *s, int flags );

storage_text.c

@@ -53 +53 @@
         
         fscanf( fp, "%32[^\n]s", s );
-        if( setpass( irc, password, s ) < 0 )
+
+        if (checkpass (password, s) != 0) 
         {
                 fclose( fp );
@@ -277 +278 @@
         fclose( fp );
 
-        /*FIXME: Check password */
+        if (checkpass( password, s) == -1)
+                return STORAGE_INVALID_PASSWORD;
 
         return STORAGE_OK;