Attachment 152093 Details for Bug 196800 – svn diff patch based on original

[patch] svn diff patch based on original

patch-mpd5 (text/plain), 7.17 KB, created by Bernard Spil on 2015-01-24 12:50:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2015-01-24 12:50:55 UTC

Size: 7.17 KB

patch

obsolete

>Index: files/patch-src_ecp__dese.c
>===================================================================
>--- files/patch-src_ecp__dese.c	(revision 0)
>+++ files/patch-src_ecp__dese.c	(working copy)
>@@ -0,0 +1,39 @@
>+--- src/ecp_dese.c.orig	2013-06-11 09:00:00 UTC
>++++ src/ecp_dese.c
>+@@ -89,11 +89,10 @@ DesConfigure(Bund b)
>+ {
>+   EcpState	const ecp = &b->ecp;
>+   DesInfo	const des = &ecp->des;
>+-  des_cblock	key;
>++  DES_cblock	key;
>+ 
>+-  des_check_key = FALSE;
>+-  des_string_to_key(ecp->key, &key);
>+-  des_set_key(&key, des->ks);
>++  DES_string_to_key(ecp->key, &key);
>++  DES_set_key(&key, &des->ks);
>+   des->xmit_seq = 0;
>+   des->recv_seq = 0;
>+ }
>+@@ -191,7 +190,7 @@ DesEncrypt(Bund b, Mbuf plain)
>+   {
>+     u_char	*const block = MBDATA(cypher) + DES_OVERHEAD + k;
>+ 
>+-    des_cbc_encrypt(block, block, 8, des->ks, &des->xmit_ivec, TRUE);
>++    DES_cbc_encrypt(block, block, 8, &des->ks, &des->xmit_ivec, TRUE);
>+     memcpy(des->xmit_ivec, block, 8);
>+   }
>+ 
>+@@ -258,10 +257,10 @@ DesDecrypt(Bund b, Mbuf cypher)
>+   for (k = 0; k < clen; k += 8)
>+   {
>+     u_char	*const block = MBDATA(plain) + k;
>+-    des_cblock	next_ivec;
>++    DES_cblock	next_ivec;
>+ 
>+     memcpy(next_ivec, block, 8);
>+-    des_cbc_encrypt(block, block, 8, des->ks, &des->recv_ivec, FALSE);
>++    DES_cbc_encrypt(block, block, 8, &des->ks, &des->recv_ivec, FALSE);
>+     memcpy(des->recv_ivec, next_ivec, 8);
>+   }
>+ 
>
>Property changes on: files/patch-src_ecp__dese.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>Index: files/patch-src_ecp__dese.h
>===================================================================
>--- files/patch-src_ecp__dese.h	(revision 0)
>+++ files/patch-src_ecp__dese.h	(working copy)
>@@ -0,0 +1,17 @@
>+--- src/ecp_dese.h.orig	2013-06-11 09:00:00 UTC
>++++ src/ecp_dese.h
>+@@ -30,11 +30,11 @@
>+   
>+   struct desinfo
>+   {
>+-    des_cblock		xmit_ivec;	/* Xmit initialization vector */
>+-    des_cblock		recv_ivec;	/* Recv initialization vector */
>++    DES_cblock		xmit_ivec;	/* Xmit initialization vector */
>++    DES_cblock		recv_ivec;	/* Recv initialization vector */
>+     u_int16_t		xmit_seq;	/* Transmit sequence number */
>+     u_int16_t		recv_seq;	/* Receive sequence number */
>+-    des_key_schedule	ks;		/* Key schedule */
>++    DES_key_schedule	ks;		/* Key schedule */
>+     struct dese_stats	recv_stats;	
>+     struct dese_stats	xmit_stats;	
>+   };
>
>Property changes on: files/patch-src_ecp__dese.h
>___________________________________________________________________
>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
>Index: files/patch-src_ecp__dese__bis.c
>===================================================================
>--- files/patch-src_ecp__dese__bis.c	(revision 0)
>+++ files/patch-src_ecp__dese__bis.c	(working copy)
>@@ -0,0 +1,39 @@
>+--- src/ecp_dese_bis.c.orig	2013-06-11 09:00:00 UTC
>++++ src/ecp_dese_bis.c
>+@@ -89,11 +89,10 @@ DeseBisConfigure(Bund b)
>+ {
>+   EcpState	const ecp = &b->ecp;
>+   DeseBisInfo	const des = &ecp->desebis;
>+-  des_cblock	key;
>++  DES_cblock	key;
>+ 
>+-  des_check_key = FALSE;
>+-  des_string_to_key(ecp->key, &key);
>+-  des_set_key(&key, des->ks);
>++  DES_string_to_key(ecp->key, &key);
>++  DES_set_key(&key, &des->ks);
>+   des->xmit_seq = 0;
>+   des->recv_seq = 0;
>+ }
>+@@ -204,7 +203,7 @@ DeseBisEncrypt(Bund b, Mbuf plain)
>+   {
>+     u_char	*const block = MBDATA(cypher) + DES_OVERHEAD + k;
>+ 
>+-    des_cbc_encrypt(block, block, 8, des->ks, &des->xmit_ivec, TRUE);
>++    DES_cbc_encrypt(block, block, 8, &des->ks, &des->xmit_ivec, TRUE);
>+     memcpy(des->xmit_ivec, block, 8);
>+   }
>+ 
>+@@ -271,10 +270,10 @@ DeseBisDecrypt(Bund b, Mbuf cypher)
>+   for (k = 0; k < clen; k += 8)
>+   {
>+     u_char	*const block = MBDATA(plain) + k;
>+-    des_cblock	next_ivec;
>++    DES_cblock	next_ivec;
>+ 
>+     memcpy(next_ivec, block, 8);
>+-    des_cbc_encrypt(block, block, 8, des->ks, &des->recv_ivec, FALSE);
>++    DES_cbc_encrypt(block, block, 8, &des->ks, &des->recv_ivec, FALSE);
>+     memcpy(des->recv_ivec, next_ivec, 8);
>+   }
>+ 
>
>Property changes on: files/patch-src_ecp__dese__bis.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
>Index: files/patch-src_ecp__dese__bis.h
>===================================================================
>--- files/patch-src_ecp__dese__bis.h	(revision 0)
>+++ files/patch-src_ecp__dese__bis.h	(working copy)
>@@ -0,0 +1,17 @@
>+--- src/ecp_dese_bis.h.orig	2013-06-11 09:00:00 UTC
>++++ src/ecp_dese_bis.h
>+@@ -30,11 +30,11 @@
>+   
>+   struct desebisinfo
>+   {
>+-    des_cblock		xmit_ivec;	/* Xmit initialization vector */
>+-    des_cblock		recv_ivec;	/* Recv initialization vector */
>++    DES_cblock		xmit_ivec;	/* Xmit initialization vector */
>++    DES_cblock		recv_ivec;	/* Recv initialization vector */
>+     u_int16_t		xmit_seq;	/* Transmit sequence number */
>+     u_int16_t		recv_seq;	/* Receive sequence number */
>+-    des_key_schedule	ks;		/* Key schedule */
>++    DES_key_schedule	ks;		/* Key schedule */
>+     struct desebis_stats recv_stats;	
>+     struct desebis_stats xmit_stats;	
>+   };
>
>Property changes on: files/patch-src_ecp__dese__bis.h
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>Index: files/patch-src_msoft.c
>===================================================================
>--- files/patch-src_msoft.c	(revision 0)
>+++ files/patch-src_msoft.c	(working copy)
>@@ -0,0 +1,25 @@
>+--- src/msoft.c.orig	2013-06-11 09:00:00 UTC
>++++ src/msoft.c
>+@@ -164,7 +164,7 @@ ChallengeResponse(const u_char *chal, co
>+ static void
>+ DesEncrypt(const u_char *clear, u_char *key0, u_char *cypher)
>+ {
>+-  des_key_schedule	ks;
>++  DES_key_schedule	ks;
>+   u_char		key[8];
>+ 
>+ /* Create DES key */
>+@@ -177,11 +177,11 @@ DesEncrypt(const u_char *clear, u_char *
>+   key[5] = (key0[4] << 3) | (key0[5] >> 5);
>+   key[6] = (key0[5] << 2) | (key0[6] >> 6);
>+   key[7] = key0[6] << 1;
>+-  des_set_key((des_cblock *) key, ks);
>++  DES_set_key((DES_cblock *) key, &ks);
>+ 
>+ /* Encrypt using key */
>+ 
>+-  des_ecb_encrypt((des_cblock *) clear, (des_cblock *) cypher, ks, 1);
>++  DES_ecb_encrypt((DES_cblock *) clear, (DES_cblock *) cypher, &ks, 1);
>+ }
>+ 
>+ /*
>
>Property changes on: files/patch-src_msoft.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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

Actions: View | Diff

Attachments on bug 196800: 151728 | 152093 | 152094