[BACK]Return to ecp_dese_bis.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / mpd / src

Diff for /embedaddon/mpd/src/ecp_dese_bis.c between versions 1.1 and 1.1.1.3

version 1.1, 2012/02/21 23:32:47 version 1.1.1.3, 2021/03/17 00:39:23
Line 89  DeseBisConfigure(Bund b) Line 89  DeseBisConfigure(Bund b)
 {  {
   EcpState      const ecp = &b->ecp;    EcpState      const ecp = &b->ecp;
   DeseBisInfo   const des = &ecp->desebis;    DeseBisInfo   const des = &ecp->desebis;
  des_cblock key;  DES_cblock key;
   
  des_check_key = FALSE;  DES_string_to_key(ecp->key, &key);
  des_string_to_key(ecp->key, &key);  DES_set_key(&key, &des->ks);
  des_set_key(&key, des->ks); 
   des->xmit_seq = 0;    des->xmit_seq = 0;
   des->recv_seq = 0;    des->recv_seq = 0;
 }  }
Line 105  DeseBisConfigure(Bund b) Line 104  DeseBisConfigure(Bund b)
 static int  static int
 DeseBisSubtractBloat(Bund b, int size)  DeseBisSubtractBloat(Bund b, int size)
 {  {
     (void)b;
   size -= DES_OVERHEAD; /* reserve space for header */    size -= DES_OVERHEAD; /* reserve space for header */
   size &= ~0x7;    size &= ~0x7;
   size--;               /* reserve space for possible padding */    size--;               /* reserve space for possible padding */
Line 204  DeseBisEncrypt(Bund b, Mbuf plain) Line 204  DeseBisEncrypt(Bund b, Mbuf plain)
   {    {
     u_char      *const block = MBDATA(cypher) + DES_OVERHEAD + k;      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);      memcpy(des->xmit_ivec, block, 8);
   }    }
   
Line 271  DeseBisDecrypt(Bund b, Mbuf cypher) Line 271  DeseBisDecrypt(Bund b, Mbuf cypher)
   for (k = 0; k < clen; k += 8)    for (k = 0; k < clen; k += 8)
   {    {
     u_char      *const block = MBDATA(plain) + k;      u_char      *const block = MBDATA(plain) + k;
    des_cblock next_ivec;    DES_cblock next_ivec;
   
     memcpy(next_ivec, block, 8);      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);      memcpy(des->recv_ivec, next_ivec, 8);
   }    }
   
Line 323  DeseBisBuildConfigReq(Bund b, u_char *cp) Line 323  DeseBisBuildConfigReq(Bund b, u_char *cp)
   EcpState      const ecp = &b->ecp;    EcpState      const ecp = &b->ecp;
   DeseBisInfo   const des = &ecp->desebis;    DeseBisInfo   const des = &ecp->desebis;
   
  ((u_int32_t *) des->xmit_ivec)[0] = random();  ((u_int32_t *)(void *) des->xmit_ivec)[0] = random();
  ((u_int32_t *) des->xmit_ivec)[1] = random();  ((u_int32_t *)(void *) des->xmit_ivec)[1] = random();
   return(FsmConfValue(cp, ECP_TY_DESE_bis, 8, des->xmit_ivec));    return(FsmConfValue(cp, ECP_TY_DESE_bis, 8, des->xmit_ivec));
 }  }
   
Removed from v.1.1  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>