diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2015-03-15 15:37:55 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2015-03-15 15:37:55 +0000 |
| commit | 7aeb4498bee4690cff933a0b6529782f1ee61a00 (patch) | |
| tree | 55fa3c3aeacdb7896d689de79304f1302ea20bc5 /security/libtomcrypt | |
| parent | 471dc942a3527242e5723015a7821dc53b648475 (diff) | |
Notes
Diffstat (limited to 'security/libtomcrypt')
| -rw-r--r-- | security/libtomcrypt/files/patch-src_headers_tomcrypt__macros.h | 104 |
1 files changed, 104 insertions, 0 deletions
diff --git a/security/libtomcrypt/files/patch-src_headers_tomcrypt__macros.h b/security/libtomcrypt/files/patch-src_headers_tomcrypt__macros.h new file mode 100644 index 000000000000..ac376421b724 --- /dev/null +++ b/security/libtomcrypt/files/patch-src_headers_tomcrypt__macros.h @@ -0,0 +1,104 @@ +--- src/headers/tomcrypt_macros.h.orig 2007-05-12 14:46:25 UTC ++++ src/headers/tomcrypt_macros.h +@@ -262,21 +262,19 @@ static inline unsigned ROR(unsigned word + + #ifndef LTC_NO_ROLC + +-static inline unsigned ROLc(unsigned word, const int i) +-{ +- asm ("roll %2,%0" +- :"=r" (word) +- :"0" (word),"I" (i)); +- return word; +-} ++#define ROLc(word, i) ({ \ ++ unsigned _word = word; \ ++ asm ("roll %2,%0" \ ++ :"=r" (_word) \ ++ :"0" (_word),"I" (i)); \ ++ _word; }) + +-static inline unsigned RORc(unsigned word, const int i) +-{ +- asm ("rorl %2,%0" +- :"=r" (word) +- :"0" (word),"I" (i)); +- return word; +-} ++#define RORc(word, i) ({ \ ++ unsigned _word = word; \ ++ asm ("rorl %2,%0" \ ++ :"=r" (_word) \ ++ :"0" (_word),"I" (i)); \ ++ _word; }) + + #else + +@@ -305,21 +303,19 @@ static inline unsigned ROR(unsigned word + + #ifndef LTC_NO_ROLC + +-static inline unsigned ROLc(unsigned word, const int i) +-{ +- asm ("rotlwi %0,%0,%2" +- :"=r" (word) +- :"0" (word),"I" (i)); +- return word; +-} ++#define ROLc(word, i) ({ \ ++ unsigned _word = word; \ ++ asm ("rotlwi %0,%0,%2" \ ++ :"=r" (_word) \ ++ :"0" (_word),"I" (i)); \ ++ _word; }) + +-static inline unsigned RORc(unsigned word, const int i) +-{ +- asm ("rotrwi %0,%0,%2" +- :"=r" (word) +- :"0" (word),"I" (i)); +- return word; +-} ++#define RORc(word, i) ({ \ ++ unsigned _word = word; \ ++ asm ("rotrwi %0,%0,%2" \ ++ :"=r" (_word) \ ++ :"0" (_word),"I" (i)); \ ++ _word; }) + + #else + +@@ -361,21 +357,19 @@ static inline unsigned long ROR64(unsign + + #ifndef LTC_NO_ROLC + +-static inline unsigned long ROL64c(unsigned long word, const int i) +-{ +- asm("rolq %2,%0" +- :"=r" (word) +- :"0" (word),"J" (i)); +- return word; +-} ++#define ROL64c(word, i) ({ \ ++ unsigned long _word = word; \ ++ asm ("rolq %2,%0" \ ++ :"=r" (_word) \ ++ :"0" (_word),"J" (i)); \ ++ _word; }) + +-static inline unsigned long ROR64c(unsigned long word, const int i) +-{ +- asm("rorq %2,%0" +- :"=r" (word) +- :"0" (word),"J" (i)); +- return word; +-} ++#define ROR64c(word, i) ({ \ ++ unsigned long _word = word; \ ++ asm ("rorq %2,%0" \ ++ :"=r" (_word) \ ++ :"0" (_word),"J" (i)); \ ++ _word; }) + + #else /* LTC_NO_ROLC */ + |