Changeset 77bfd07

Timestamp:

2007-11-23T23:07:44Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3a80471

Parents:

df6d1da

Message:

Replaced GPL-incompatible SHA1 hashing code (and renamed the files in case
I ever need SHA256 ;-)).

Files:

• lib/Makefile (modified) (1 diff)
• lib/sha.c (deleted)
• lib/sha.h (deleted)
• lib/sha1.c (added)
• lib/sha1.h (added)
• protocols/jabber/iq.c (modified) (2 diffs)
• protocols/nogaim.h (modified) (1 diff)
• protocols/yahoo/libyahoo2.c (modified) (9 diffs)

lib/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha.o $(SSL_CLIENT) url.o
+objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o
 
 CFLAGS += -Wall

protocols/jabber/iq.c

@@ -23 +23 @@
 
 #include "jabber.h"
+#include "sha1.h"
 
 static xt_status jabber_parse_roster( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
@@ -233 +234 @@
                 /* We can do digest authentication, it seems, and of
                    course we prefer that. */
-                SHA_CTX sha;
+                sha1_state_t sha;
                 char hash_hex[41];
                 unsigned char hash[20];
                 int i;
                 
-                shaInit( &sha );
-                shaUpdate( &sha, (unsigned char*) s, strlen( s ) );
-                shaUpdate( &sha, (unsigned char*) ic->acc->pass, strlen( ic->acc->pass ) );
-                shaFinal( &sha, hash );
+                sha1_init( &sha );
+                sha1_append( &sha, (unsigned char*) s, strlen( s ) );
+                sha1_append( &sha, (unsigned char*) ic->acc->pass, strlen( ic->acc->pass ) );
+                sha1_finish( &sha, hash );
                 
                 for( i = 0; i < 20; i ++ )

protocols/nogaim.h

@@ -43 +43 @@
 #include "proxy.h"
 #include "md5.h"
-#include "sha.h"
 
 #define BUF_LEN MSG_LEN

protocols/yahoo/libyahoo2.c

@@ -76 +76 @@
 #include <ctype.h>
 
-#include "sha.h"
+#include "sha1.h"
 #include "md5.h"
 #include "yahoo2.h"
@@ -1820 +1820 @@
         md5_state_t        ctx;
 
-        SHA_CTX            ctx1;
-        SHA_CTX            ctx2;
+        sha1_state_t       ctx1;
+        sha1_state_t       ctx2;
 
         char *alphabet1 = "FBZDWAGHrJTLMNOPpRSKUVEXYChImkwQ";
@@ -1877 +1877 @@
         magic_ptr = (unsigned char *)seed;
 
-        while (*magic_ptr != (int)NULL) {
+        while (*magic_ptr != 0) {
                 char *loc;
 
@@ -2056 +2056 @@
                 memset(&(pass_hash_xor2[cnt]), 0x5c, 64-cnt);
 
-        shaInit(&ctx1);
-        shaInit(&ctx2);
+        sha1_init(&ctx1);
+        sha1_init(&ctx2);
 
         /* The first context gets the password hash XORed 
@@ -2064 +2064 @@
          * challenge. */
 
-        shaUpdate(&ctx1, pass_hash_xor1, 64);
+        sha1_append(&ctx1, pass_hash_xor1, 64);
         if (j >= 3 )
-                ctx1.sizeLo = 0x1ff;
-        shaUpdate(&ctx1, magic_key_char, 4);
-        shaFinal(&ctx1, digest1);
+                ctx1.Length_Low = 0x1ff;
+        sha1_append(&ctx1, magic_key_char, 4);
+        sha1_finish(&ctx1, digest1);
 
          /* The second context gets the password hash XORed 
@@ -2074 +2074 @@
           * of the first context. */
 
-        shaUpdate(&ctx2, pass_hash_xor2, 64);
-        shaUpdate(&ctx2, digest1, 20);
-        shaFinal(&ctx2, digest2);
+        sha1_append(&ctx2, pass_hash_xor2, 64);
+        sha1_append(&ctx2, digest1, 20);
+        sha1_finish(&ctx2, digest2);
 
         /* Now that we have digest2, use it to fetch 
@@ -2147 +2147 @@
                 memset(&(crypt_hash_xor2[cnt]), 0x5c, 64-cnt);
 
-        shaInit(&ctx1);
-        shaInit(&ctx2);
+        sha1_init(&ctx1);
+        sha1_init(&ctx2);
 
         /* The first context gets the password hash XORed 
@@ -2155 +2155 @@
          * challenge. */
 
-        shaUpdate(&ctx1, crypt_hash_xor1, 64);
+        sha1_append(&ctx1, crypt_hash_xor1, 64);
         if (j >= 3 )
-                ctx1.sizeLo = 0x1ff;
-        shaUpdate(&ctx1, magic_key_char, 4);
-        shaFinal(&ctx1, digest1);
+                ctx1.Length_Low = 0x1ff;
+        sha1_append(&ctx1, magic_key_char, 4);
+        sha1_finish(&ctx1, digest1);
 
         /* The second context gets the password hash XORed 
@@ -2165 +2165 @@
          * of the first context. */
 
-        shaUpdate(&ctx2, crypt_hash_xor2, 64);
-        shaUpdate(&ctx2, digest1, 20);
-        shaFinal(&ctx2, digest2);
+        sha1_append(&ctx2, crypt_hash_xor2, 64);
+        sha1_append(&ctx2, digest1, 20);
+        sha1_finish(&ctx2, digest2);
 
         /* Now that we have digest2, use it to fetch