mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00
Code Issues Releases Activity

In the embedded copy of libtomcrypt, change the ROLc/RORc inline

Browse Source 
functions to macros, so the constraints requirements are satisfied at
compile time.  It is almost exactly the same as the patch for
libtomcrypt itself, in PR 198017.

Approved by:	maintainer (vanilla)
PR:		198190
This commit is contained in:
Dimitry Andric 2015-03-03 07:27:44 +00:00
parent 19a52b429c
commit def5bf44a8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=380341
1 changed files with 107 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
security/p5-CryptX/files/patch-src__ltc__headerss__tomcrypt_macros.h Normal file
View File

@ -0,0 +1,107 @@
--- src/ltc/headers/tomcrypt_macros.h.orig 2014-01-23 16:45:59.000000000 +0100
+++ src/ltc/headers/tomcrypt_macros.h 2015-03-02 20:23:48.396007000 +0100
@@ -281,21 +281,19 @@
#ifndef LTC_NO_ROLC
-static inline ulong32 ROLc(ulong32 word, const int i)
-{
- asm ("roll %2,%0"
- :"=r" (word)
- :"0" (word),"I" (i));
- return word;
-}
-
-static inline ulong32 RORc(ulong32 word, const int i)
-{
- asm ("rorl %2,%0"
- :"=r" (word)
- :"0" (word),"I" (i));
- return word;
-}
+#define ROLc(word, i) ({ \
+ ulong32 _word = word; \
+ asm ("roll %2,%0" \
+ :"=r" (_word) \
+ :"0" (_word),"I" (i)); \
+ _word; })
+
+#define RORc(word, i) ({ \
+ ulong32 _word = word; \
+ asm ("rorl %2,%0" \
+ :"=r" (_word) \
+ :"0" (_word),"I" (i)); \
+ _word; })
#else
@@ -324,21 +322,19 @@
#ifndef LTC_NO_ROLC
-static inline ulong32 ROLc(ulong32 word, const int i)
-{
- asm ("rotlwi %0,%0,%2"
- :"=r" (word)
- :"0" (word),"I" (i));
- return word;
-}
-
-static inline ulong32 RORc(ulong32 word, const int i)
-{
- asm ("rotrwi %0,%0,%2"
- :"=r" (word)
- :"0" (word),"I" (i));
- return word;
-}
+#define ROLc(word, i) ({ \
+ ulong32 _word = word; \
+ asm ("rotlwi %0,%0,%2" \
+ :"=r" (_word) \
+ :"0" (_word),"I" (i)); \
+ _word; })
+
+#define RORc(word, i) ({ \
+ ulong32 _word = word; \
+ asm ("rotrwi %0,%0,%2" \
+ :"=r" (_word) \
+ :"0" (_word),"I" (i)); \
+ _word; })
#else
@@ -380,21 +376,19 @@
#ifndef LTC_NO_ROLC
-static inline ulong64 ROL64c(ulong64 word, const int i)
-{
- asm("rolq %2,%0"
- :"=r" (word)
- :"0" (word),"J" (i));
- return word;
-}
-
-static inline ulong64 ROR64c(ulong64 word, const int i)
-{
- asm("rorq %2,%0"
- :"=r" (word)
- :"0" (word),"J" (i));
- return word;
-}
+#define ROL64c(word, i) ({ \
+ ulong64 _word = word; \
+ asm ("rolq %2,%0" \
+ :"=r" (_word) \
+ :"0" (_word),"J" (i)); \
+ _word; })
+
+#define ROR64c(word, i) ({ \
+ ulong64 _word = word; \
+ asm ("rorq %2,%0" \
+ :"=r" (_word) \
+ :"0" (_word),"J" (i)); \
+ _word; })
#else /* LTC_NO_ROLC */