Changeset a301379c

Timestamp:

2005-12-13T22:43:59Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

b73ac9c

Parents:

ab49fdc

Message:

Simplify obfuscation functions - make them a bit more bitlbee-independent

Files:

• crypting.c (modified) (10 diffs)
• crypting.h (modified) (1 diff)

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"
@@ -38 +34 @@
 #include <stdio.h>
 #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
 
 /*\
@@ -83 +64 @@
 
 
-char *hashpass (irc_t *irc) {
+char *hashpass (const char *password)
+{
         md5_state_t md5state;
         md5_byte_t digest[16];
@@ -90 +72 @@
         char *rv;
         
-        if (irc->password == NULL) return (NULL);
+        if (password == NULL) return (NULL);
         
-        rv = (char *)g_malloc (33);
-        memset (rv, 0, 33);
+        rv = g_new0 (char, 33);
         
         md5_init (&md5state);
-        md5_append (&md5state, (unsigned char *)irc->password, strlen (irc->password));
+        md5_append (&md5state, (const unsigned char *)password, strlen (password));
         md5_finish (&md5state, digest);
         
@@ -108 +89 @@
 }
 
-char *obfucrypt (irc_t *irc, char *line) {
+char *obfucrypt (char *line, const char *password) 
+{
         int i, j;
         char *rv;
         
-        if (irc->password == NULL) return (NULL);
+        if (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;
@@ -121 +102 @@
                 /* Encrypt/obfuscate the line, using the password */
                 if (*(signed char*)line < 0) *line = - (*line);
-                if (((signed char*)irc->password)[i] < 0) irc->password[i] = - irc->password[i];
                 
-                rv[j] = *line + irc->password[i]; /* Overflow intended */
+                rv[j] = *line + password[i]; /* Overflow intended */
                 
                 line++;
-                if (!irc->password[++i]) i = 0;
+                if (!password[++i]) i = 0;
                 j++;
         }
@@ -133 +113 @@
 }
 
-char *deobfucrypt (irc_t *irc, char *line) {
+char *deobfucrypt (char *line, const char *password) 
+{
         int i, j;
         char *rv;
         
-        if (irc->password == NULL) return (NULL);
+        if (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;
         while (*line) {
                 /* Decrypt/deobfuscate the line, using the pass */
-                rv[j] = *line - irc->password[i]; /* Overflow intended */
+                rv[j] = *line - password[i]; /* Overflow intended */
                 
                 line++;
-                if (!irc->password[++i]) i = 0;
+                if (!password[++i]) i = 0;
                 j++;
         }
@@ -162 +142 @@
 int main( int argc, char *argv[] )
 {
-        irc_t *irc = g_malloc( sizeof( irc_t ) );
         char *hash, *action, line[256];
-        char* (*func)( irc_t *, char * );
+        char* (*func)( char *, const char * );
         
         if( argc < 2 )
@@ -174 +153 @@
         }
         
-        memset( irc, 0, sizeof( irc_t ) );
-        irc->password = g_strdup( argv[1] );
-        
-        hash = hashpass( irc );
+        hash = hashpass( argv[1] );
         action = argv[0] + strlen( argv[0] ) - strlen( "encode" );
         
@@ -209 +185 @@
                 fgetc( stdin );
                 
-                out = func( irc, line );
+                out = func( line, argv[1] );
                 printf( "%s\n", out );
                 g_free( out );

crypting.h

@@ -25 +25 @@
 
 int checkpass (const char *password, const char *md5sum);
-char *hashpass (irc_t *irc);
-char *obfucrypt (irc_t *irc, char *line);
-char *deobfucrypt (irc_t *irc, char *line);
+char *hashpass (const char *password);
+char *obfucrypt (char *line, const char *password);
+char *deobfucrypt (char *line, const char *password);