Changes in crypting.c [a301379c:34759e6]

File:

• crypting.c (modified) (10 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;
+
+#include "md5.h"
+#include "crypting.h"
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#endif
+
 /*\
  * [SH] Do _not_ call this if it's not entirely sure that it will not cause
@@ -64 +83 @@
 
 
-char *hashpass (const char *password)
-{
+char *hashpass (irc_t *irc) {
         md5_state_t md5state;
         md5_byte_t digest[16];
@@ -72 +90 @@
         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 +108 @@
 }
 
-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 = g_new0(char, strlen (line) + 1);
         
         i = j = 0;
@@ -102 +121 @@
                 /* 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 +133 @@
 }
 
-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 = g_new0(char, 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 +162 @@
 int main( int argc, char *argv[] )
 {
+        irc_t *irc = g_new0( irc_t, 1 );
         char *hash, *action, line[256];
-        char* (*func)( char *, const char * );
+        char* (*func)( irc_t *, char * );
         
         if( argc < 2 )
@@ -153 +174 @@
         }
         
-        hash = hashpass( argv[1] );
+        irc->password = g_strdup( argv[1] );
+        
+        hash = hashpass( irc );
         action = argv[0] + strlen( argv[0] ) - strlen( "encode" );
         
@@ -185 +208 @@
                 fgetc( stdin );
                 
-                out = func( line, argv[1] );
+                out = func( irc, line );
                 printf( "%s\n", out );
                 g_free( out );