patch-libtomcrypt_src_headers_tomcrypt_macros_h 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. fix from:
  2. http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html
  3. --- dropbear-2014.63.orig/libtomcrypt/src/headers/tomcrypt_macros.h 2014-02-19 15:05:24.000000000 +0100
  4. +++ dropbear-2014.63/libtomcrypt/src/headers/tomcrypt_macros.h 2014-03-01 12:36:23.000000000 +0100
  5. @@ -343,7 +343,7 @@ static inline unsigned RORc(unsigned wor
  6. /* 64-bit Rotates */
  7. #if !defined(__STRICT_ANSI__) && defined(__GNUC__) && defined(__x86_64__) && !defined(LTC_NO_ASM)
  8. -static inline unsigned long ROL64(unsigned long word, int i)
  9. +static inline unsigned long long ROL64(unsigned long long word, int i)
  10. {
  11. asm("rolq %%cl,%0"
  12. :"=r" (word)
  13. @@ -351,7 +351,7 @@ static inline unsigned long ROL64(unsign
  14. return word;
  15. }
  16. -static inline unsigned long ROR64(unsigned long word, int i)
  17. +static inline unsigned long long ROR64(unsigned long long word, int i)
  18. {
  19. asm("rorq %%cl,%0"
  20. :"=r" (word)
  21. @@ -361,7 +361,7 @@ static inline unsigned long ROR64(unsign
  22. #ifndef LTC_NO_ROLC
  23. -static inline unsigned long ROL64c(unsigned long word, const int i)
  24. +static inline unsigned long long ROL64c(unsigned long long word, const int i)
  25. {
  26. asm("rolq %2,%0"
  27. :"=r" (word)
  28. @@ -369,7 +369,7 @@ static inline unsigned long ROL64c(unsig
  29. return word;
  30. }
  31. -static inline unsigned long ROR64c(unsigned long word, const int i)
  32. +static inline unsigned long long ROR64c(unsigned long long word, const int i)
  33. {
  34. asm("rorq %2,%0"
  35. :"=r" (word)