Changes in crypting.c [43e3368:34759e6]

File:

• crypting.c (modified) (10 diffs)

crypting.c

@@ -46 +46 @@
 } irc_t;
 
-#define set_add( a, b, c, d )
-#define set_find( a, b ) NULL
-
 #include "md5.h"
 #include "crypting.h"
@@ -55 +52 @@
 #include <stdlib.h>
 
-#define irc_usermsg
-
 #endif
 
@@ -65 +60 @@
 \*/
 
-/* USE WITH CAUTION!
-   Sets pass without checking */
-void setpassnc (irc_t *irc, char *pass) {
-        if (!set_find (irc, "password"))
-                set_add (irc, "password", NULL, passchange);
-        
-        if (irc->password) g_free (irc->password);
-        
-        if (pass) {
-                irc->password = g_strdup (pass);
-                irc_usermsg (irc, "Password successfully changed");
-        } else {
-                irc->password = NULL;
-        }
-}
-
-char *passchange (irc_t *irc, void *set, char *value) {
-        setpassnc (irc, value);
-        return (NULL);
-}
-
-int setpass (irc_t *irc, char *pass, char* md5sum) {
+int checkpass (const char *pass, const char *md5sum)
+{
         md5_state_t md5state;
         md5_byte_t digest[16];
@@ -103 +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) {
@@ -135 +108 @@
 }
 
-char *obfucrypt (irc_t *irc, char *line) {
+char *obfucrypt (irc_t *irc, char *line) 
+{
         int i, j;
         char *rv;
@@ -141 +115 @@
         if (irc->password == NULL) return (NULL);
         
-        rv = (char *)g_malloc (strlen (line) + 1);
-        memset (rv, '\0', strlen (line) + 1);
+        rv = g_new0(char, strlen (line) + 1);
         
         i = j = 0;
@@ -160 +133 @@
 }
 
-char *deobfucrypt (irc_t *irc, char *line) {
+char *deobfucrypt (irc_t *irc, char *line) 
+{
         int i, j;
         char *rv;
@@ -166 +140 @@
         if (irc->password == NULL) return (NULL);
         
-        rv = (char *)g_malloc (strlen (line) + 1);
-        memset (rv, '\0', strlen (line) + 1);
+        rv = g_new0(char, strlen (line) + 1);
         
         i = j = 0;
@@ -189 +162 @@
 int main( int argc, char *argv[] )
 {
-        irc_t *irc = g_malloc( sizeof( irc_t ) );
+        irc_t *irc = g_new0( irc_t, 1 );
         char *hash, *action, line[256];
         char* (*func)( irc_t *, char * );
@@ -201 +174 @@
         }
         
-        memset( irc, 0, sizeof( irc_t ) );
         irc->password = g_strdup( argv[1] );