Changeset 33287 in project


Ignore:
Timestamp:
04/03/16 12:02:55 (5 years ago)
Author:
Alaric Snell-Pym
Message:

Fixed compiler warnings, version changed to 1.4

Location:
release/4/aes/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • release/4/aes/trunk/aes.scm

    r16949 r33287  
    735735    * @return the number of rounds for the given cipher key size.
    736736    */
    737    static int rijndaelSetupEncrypt(u32 *rk, const u8 *key, int keybits)
    738    {
     737   static int rijndaelSetupEncrypt(void *urk, const u8 *key, int keybits)
     738   {
     739     u32 *rk = (u32*) urk;
    739740     int i = 0;
    740741     u32 temp;
     
    824825    * @return the number of rounds for the given cipher key size.
    825826    */
    826    static int rijndaelSetupDecrypt(u32 *rk, const u8 *key, int keybits)
    827    {
     827   static int rijndaelSetupDecrypt(void *urk, const u8 *key, int keybits)
     828   {
     829     u32 *rk = (u32*) urk;
    828830     int nrounds, i, j;
    829831     u32 temp;
     
    867869   }
    868870
    869    static void rijndaelEncrypt(const u32 *rk, int nrounds, const u8 plaintext[16],
     871   static void rijndaelEncrypt(const void *urk, int nrounds, const u8 plaintext[16],
    870872     u8 ciphertext[16])
    871873   {
     874     const u32 *rk = (const u32*)urk;
    872875     u32 s0, s1, s2, s3, t0, t1, t2, t3;
    873876     #ifndef FULL_UNROLL
     
    10491052   }
    10501053
    1051    static void rijndaelDecrypt(const u32 *rk, int nrounds, const u8 ciphertext[16],
     1054   static void rijndaelDecrypt(const void *urk, int nrounds, const u8 ciphertext[16],
    10521055     u8 plaintext[16])
    10531056   {
     1057     const u32 *rk = (const u32*)urk;
    10541058     u32 s0, s1, s2, s3, t0, t1, t2, t3;
    10551059     #ifndef FULL_UNROLL
  • release/4/aes/trunk/aes.setup

    r25910 r33287  
    66  'aes
    77  '("aes.o" "aes.import.so" "aes.so")
    8   '((version 1.3)
     8  '((version 1.4)
    99    (static "aes.o"))) ;; for static linking
Note: See TracChangeset for help on using the changeset viewer.