Changes in crypting.c [a301379c:43e3368]

File:

• crypting.c (modified) (11 diffs)

crypting.c

@@ -29 +29 @@
    the programs will be built. */
 
+#ifndef CRYPTING_MAIN
+#define BITLBEE_CORE
+#include "bitlbee.h"
+#include "irc.h"
 #include "md5.h"
 #include "crypting.h"
@@ -35 +39 @@
 #include <stdlib.h>
 
+#else
+
+typedef struct irc
+{
+        char *password;
+} irc_t;
+
+#define set_add( a, b, c, d )
+#define set_find( a, b ) NULL
+
+#include "md5.h"
+#include "crypting.h"
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define irc_usermsg
+
+#endif
+
 /*\
  * [SH] Do _not_ call this if it's not entirely sure that it will not cause
@@ -41 +65 @@
 \*/
 
-int checkpass (const char *pass, const char *md5sum)
-{
+/* 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) {
         md5_state_t md5state;
         md5_byte_t digest[16];
@@ -59 +103 @@
                 if (digits[1] != md5sum[j + 1]) return (-1);
         }
-
-        return( 0 );
-}
-
-
-char *hashpass (const char *password)
-{
+        
+        /* If pass is correct, we end up here and we set the pass */
+        setpassnc (irc, pass);
+        
+        return (0);
+}
+
+char *hashpass (irc_t *irc) {
         md5_state_t md5state;
         md5_byte_t digest[16];
@@ -72 +117 @@
         char *rv;
         
-        if (password == NULL) return (NULL);
-        
-        rv = g_new0 (char, 33);
+        if (irc->password == NULL) return (NULL);
+        
+        rv = (char *)g_malloc (33);
+        memset (rv, 0, 33);
         
         md5_init (&md5state);
-        md5_append (&md5state, (const unsigned char *)password, strlen (password));
+        md5_append (&md5state, (unsigned char *)irc->password, strlen (irc->password));
         md5_finish (&md5state, digest);
         
@@ -89 +135 @@
 }
 
-char *obfucrypt (char *line, const char *password) 
-{
+char *obfucrypt (irc_t *irc, char *line) {
         int i, j;
         char *rv;
         
-        if (password == NULL) return (NULL);
-        
-        rv = g_new0 (char, strlen (line) + 1);
+        if (irc->password == NULL) return (NULL);
+        
+        rv = (char *)g_malloc (strlen (line) + 1);
+        memset (rv, '\0', strlen (line) + 1);
         
         i = j = 0;
@@ -102 +148 @@
                 /* Encrypt/obfuscate the line, using the password */
                 if (*(signed char*)line < 0) *line = - (*line);
-                
-                rv[j] = *line + password[i]; /* Overflow intended */
+                if (((signed char*)irc->password)[i] < 0) irc->password[i] = - irc->password[i];
+                
+                rv[j] = *line + irc->password[i]; /* Overflow intended */
                 
                 line++;
-                if (!password[++i]) i = 0;
+                if (!irc->password[++i]) i = 0;
                 j++;
         }
@@ -113 +160 @@
 }
 
-char *deobfucrypt (char *line, const char *password) 
-{
+char *deobfucrypt (irc_t *irc, char *line) {
         int i, j;
         char *rv;
         
-        if (password == NULL) return (NULL);
-        
-        rv = g_new0 (char, strlen (line) + 1);
+        if (irc->password == NULL) return (NULL);
+        
+        rv = (char *)g_malloc (strlen (line) + 1);
+        memset (rv, '\0', strlen (line) + 1);
         
         i = j = 0;
         while (*line) {
                 /* Decrypt/deobfuscate the line, using the pass */
-                rv[j] = *line - password[i]; /* Overflow intended */
+                rv[j] = *line - irc->password[i]; /* Overflow intended */
                 
                 line++;
-                if (!password[++i]) i = 0;
+                if (!irc->password[++i]) i = 0;
                 j++;
         }
@@ -142 +189 @@
 int main( int argc, char *argv[] )
 {
+        irc_t *irc = g_malloc( sizeof( irc_t ) );
         char *hash, *action, line[256];
-        char* (*func)( char *, const char * );
+        char* (*func)( irc_t *, char * );
         
         if( argc < 2 )
@@ -153 +201 @@
         }
         
-        hash = hashpass( argv[1] );
+        memset( irc, 0, sizeof( irc_t ) );
+        irc->password = g_strdup( argv[1] );
+        
+        hash = hashpass( irc );
         action = argv[0] + strlen( argv[0] ) - strlen( "encode" );
         
@@ -185 +236 @@
                 fgetc( stdin );
                 
-                out = func( line, argv[1] );
+                out = func( irc, line );
                 printf( "%s\n", out );
                 g_free( out );