[svn] / ecrypt / trunk / submissions / rabbit / opt / 2 / ecrypt-sync.h  

svn: ecrypt/trunk/submissions/rabbit/opt/2/ecrypt-sync.h

Diff for /ecrypt/trunk/submissions/rabbit/opt/2/ecrypt-sync.h between version 206 and 208

version 206, Mon Jan 29 20:29:42 2007 UTC version 208, Wed Feb 6 12:35:11 2008 UTC
Line 54 
Line 54 
   
 typedef struct RABBIT_ctx_  typedef struct RABBIT_ctx_
 {  {
    u32 x0, x1, x2, x3, x4, x5, x6, x7;  /*    u32 x0, x2, x4, x6, x1, x3, x5, x7; */
    u32 c0, c1, c2, c3, c4, c5, c6, c7;  /*    u32 c0, c1, c2, c3, c4, c5, c6, c7; */
      u32 x0, x4, x1, x5, x2, x6, x3, x7;
      u32 c0, c4, c1, c5, c2, c6, c3, c7;
    u32 carry;     u32 carry;
      u32 _align1, _align2, _align3;
   /*    u32 _align4, _align5, _align6, _align7; */
 } RABBIT_ctx;  } RABBIT_ctx;
   
 typedef struct  typedef struct
Line 65 
Line 69 
    * Put here all state variable needed during the encryption process.     * Put here all state variable needed during the encryption process.
    */     */
    RABBIT_ctx master_ctx;     RABBIT_ctx master_ctx;
   /*    u32 __align1[7]; */
    RABBIT_ctx work_ctx;     RABBIT_ctx work_ctx;
   /*    u32 __align2[7]; */
 } ECRYPT_ctx;  } ECRYPT_ctx;
   
 /* ------------------------------------------------------------------------- */  /* ------------------------------------------------------------------------- */
Line 350 
Line 356 
  * 10). Note also that all variants should have exactly the same   * 10). Note also that all variants should have exactly the same
  * external interface (i.e., the same ECRYPT_BLOCKLENGTH, etc.).   * external interface (i.e., the same ECRYPT_BLOCKLENGTH, etc.).
  */   */
 #define ECRYPT_MAXVARIANT 4  #define ECRYPT_MAXVARIANT 5
   
 #ifndef ECRYPT_VARIANT  #ifndef ECRYPT_VARIANT
 #define ECRYPT_VARIANT 4  #define ECRYPT_VARIANT 5
 #endif  #endif
   
 #if (ECRYPT_VARIANT > ECRYPT_MAXVARIANT)  #if (ECRYPT_VARIANT > ECRYPT_MAXVARIANT)


Generate output suitable for use with a patch program
Legend:
Removed from v.206  
changed lines
  Added in v.208

eSTREAM Project

Powered by ViewCVS 1.0-dev
(Powered by Apache)

ViewCVS and CVS Help