Attachment 153880 Details for Bug 198340 – svn diff for net/gq

[patch] svn diff for net/gq

patch-net_gq (text/plain), 2.46 KB, created by Bernard Spil on 2015-03-06 08:40:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2015-03-06 08:40:44 UTC

Size: 2.46 KB

patch

obsolete

>Index: net/gq/files/patch-src_gq-hash-openssl.c
>===================================================================
>--- net/gq/files/patch-src_gq-hash-openssl.c	(revision 0)
>+++ net/gq/files/patch-src_gq-hash-openssl.c	(working copy)
>@@ -0,0 +1,60 @@
>+--- src/gq-hash-openssl.c.orig	2008-01-09 15:55:46.000000000 +0100
>++++ src/gq-hash-openssl.c	2015-02-28 19:27:54.038020011 +0100
>+@@ -60,7 +60,7 @@
>+      salt->str[2] = 0;
>+ 
>+      g_byte_array_append(gb, (guchar*)"{CRYPT}", 7);
>+-     des_fcrypt((gchar*)password, salt->str, (gchar*)cryptbuf);
>++     DES_fcrypt((gchar*)password, salt->str, (gchar*)cryptbuf);
>+ 
>+      g_byte_array_append(gb, cryptbuf, strlen((gchar*)cryptbuf));
>+ 
>+@@ -242,7 +242,7 @@
>+ /* FIXME: silently assumes US-ASCII (or a single-byte encoding to be
>+    handled by toupper) */
>+ 
>+-static void lm_make_key(const char *pw, des_cblock *key)
>++static void lm_make_key(const char *pw, DES_cblock *key)
>+ {
>+      int i;
>+      char *k = (char *) key;
>+@@ -253,7 +253,7 @@
>+ 	  k[i+1]  = (pw[i] << (7 - i)) & 0xff;
>+      }
>+ 
>+-     des_set_odd_parity(key);
>++     DES_set_odd_parity(key);
>+ }
>+ 
>+ GByteArray*
>+@@ -262,10 +262,10 @@
>+      unsigned int i;
>+      char hex[2];
>+      char plain[15];
>+-     des_key_schedule schedule;
>++     DES_key_schedule schedule;
>+      GByteArray *gb = NULL;
>+-     des_cblock ckey1, ckey2;
>+-     des_cblock bin1,  bin2;
>++     DES_cblock ckey1, ckey2;
>++     DES_cblock bin1,  bin2;
>+ 
>+      memset(plain, 0, sizeof(plain));
>+ 
>+@@ -274,12 +274,12 @@
>+      }
>+ 
>+      lm_make_key(plain, &ckey1);
>+-     des_set_key_unchecked(&ckey1, schedule);
>+-     des_ecb_encrypt((des_cblock*)lmhash_key, &bin1, schedule, DES_ENCRYPT);
>++     DES_set_key_unchecked(&ckey1, &schedule);
>++     DES_ecb_encrypt((DES_cblock*)lmhash_key, &bin1, &schedule, DES_ENCRYPT);
>+ 
>+      lm_make_key(plain + 7, &ckey2);
>+-     des_set_key_unchecked(&ckey2, schedule);
>+-     des_ecb_encrypt((des_cblock*)lmhash_key, &bin2, schedule, DES_ENCRYPT);
>++     DES_set_key_unchecked(&ckey2, &schedule);
>++     DES_ecb_encrypt((DES_cblock*)lmhash_key, &bin2, &schedule, DES_ENCRYPT);
>+ 
>+      gb = g_byte_array_new();
>+ 
>
>Property changes on: net/gq/files/patch-src_gq-hash-openssl.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 198340: 153880 | 153881