Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/advapi32/crypt_des.cpp

    r21326 r21916  
    245245}
    246246
    247 static void xor( unsigned char *dst, const unsigned char *a, const unsigned char *b, const int count )
     247static void Xor( unsigned char *dst, const unsigned char *a, const unsigned char *b, const int count )
    248248{
    249249    int i;
    … …  
    302302
    303303        Permute( Rexp, R, DataExpansion, 6 );
    304         xor( Rexp, Rexp, SubK, 6 );
     304        Xor( Rexp, Rexp, SubK, 6 );
    305305
    306306        sbox( Rn, Rexp );
    307307        Permute( Rexp, Rn, PBox, 4 );
    308         xor( Rn, L, Rexp, 4 );
     308        Xor( Rn, L, Rexp, 4 );
    309309
    310310        for (j = 0; j < 4; j++)
    … …  
    341341
    342342        Permute( Rexp, R, DataExpansion, 6 );
    343         xor( Rexp, Rexp, SubK, 6 );
     343        Xor( Rexp, Rexp, SubK, 6 );
    344344
    345345        sbox( Rn, Rexp );
    346346        Permute( Rexp, Rn, PBox, 4 );
    347         xor( Rn, L, Rexp, 4 );
     347        Xor( Rn, L, Rexp, 4 );
    348348
    349349        for (j = 0; j < 4; j++)
Note: See TracChangeset for help on using the changeset viewer.