--- embedaddon/mpd/src/ecp_dese_bis.c	2013/07/22 08:44:29	1.1.1.1
+++ embedaddon/mpd/src/ecp_dese_bis.c	2021/03/17 00:39:23	1.1.1.3
@@ -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;
 }
@@ -105,6 +104,7 @@ DeseBisConfigure(Bund b)
 static int
 DeseBisSubtractBloat(Bund b, int size)
 {
+  (void)b;
   size -= DES_OVERHEAD;	/* reserve space for header */
   size &= ~0x7;
   size--;	 	/* reserve space for possible padding */
@@ -204,7 +204,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 +271,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);
   }
 
@@ -323,8 +323,8 @@ DeseBisBuildConfigReq(Bund b, u_char *cp)
   EcpState	const ecp = &b->ecp;
   DeseBisInfo	const des = &ecp->desebis;
 
-  ((u_int32_t *) des->xmit_ivec)[0] = random();
-  ((u_int32_t *) des->xmit_ivec)[1] = random();
+  ((u_int32_t *)(void *) des->xmit_ivec)[0] = random();
+  ((u_int32_t *)(void *) des->xmit_ivec)[1] = random();
   return(FsmConfValue(cp, ECP_TY_DESE_bis, 8, des->xmit_ivec));
 }