aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-01-23 01:15:13 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2017-01-23 01:15:13 +0100
commit9492da7e63deae898d7bf924be5790c7fab1a4fb (patch)
treec6f291a02592c198f4cf5711c0aef33a02739943
parent9a647c326a41e8160d53e6cb5470161a44c0e8cf (diff)
downloadbusybox-w32-9492da7e63deae898d7bf924be5790c7fab1a4fb.tar.gz
busybox-w32-9492da7e63deae898d7bf924be5790c7fab1a4fb.tar.bz2
busybox-w32-9492da7e63deae898d7bf924be5790c7fab1a4fb.zip
tls: set TLS_DEBUG to 0; placate a gcc indentation warning
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--networking/tls.c2
-rw-r--r--networking/tls_symmetric.h22
2 files changed, 13 insertions, 11 deletions
diff --git a/networking/tls.c b/networking/tls.c
index 29cc5b9f3..89f2ec603 100644
--- a/networking/tls.c
+++ b/networking/tls.c
@@ -18,7 +18,7 @@
18 18
19#include "tls.h" 19#include "tls.h"
20 20
21#define TLS_DEBUG 1 21#define TLS_DEBUG 0
22#define TLS_DEBUG_HASH 0 22#define TLS_DEBUG_HASH 0
23#define TLS_DEBUG_DER 0 23#define TLS_DEBUG_DER 0
24#define TLS_DEBUG_FIXED_SECRETS 0 24#define TLS_DEBUG_FIXED_SECRETS 0
diff --git a/networking/tls_symmetric.h b/networking/tls_symmetric.h
index 8488b437e..5e0e4b6d8 100644
--- a/networking/tls_symmetric.h
+++ b/networking/tls_symmetric.h
@@ -27,30 +27,32 @@
27 27
28static ALWAYS_INLINE unsigned ROL(unsigned word, int i) 28static ALWAYS_INLINE unsigned ROL(unsigned word, int i)
29{ 29{
30 if (__builtin_constant_p(i)) //box 30 if (__builtin_constant_p(i)) { //box
31 // Rotates by constant use fewer registers, 31 // Rotates by constant use fewer registers,
32 // and on many Intel CPUs rotates by %cl take 2 cycles, not 1. 32 // and on many Intel CPUs rotates by %cl take 2 cycles, not 1.
33 asm ("roll %2,%0" //box 33 asm ("roll %2,%0"
34 :"=r" (word) 34 :"=r" (word)
35 :"0" (word),"i" (i)); 35 :"0" (word),"i" (i));
36 else //box 36 return word;
37 asm ("roll %%cl,%0" 37 } //box
38 asm ("roll %%cl,%0"
38 :"=r" (word) 39 :"=r" (word)
39 :"0" (word),"c" (i)); 40 :"0" (word),"c" (i));
40 return word; 41 return word;
41} 42}
42 43
43static ALWAYS_INLINE unsigned ROR(unsigned word, int i) 44static ALWAYS_INLINE unsigned ROR(unsigned word, int i)
44{ 45{
45 if (__builtin_constant_p(i)) //box 46 if (__builtin_constant_p(i)) { //box
46 asm ("rorl %2,%0" //box 47 asm ("rorl %2,%0"
47 :"=r" (word) 48 :"=r" (word)
48 :"0" (word),"i" (i)); 49 :"0" (word),"i" (i));
49 else //box 50 return word;
50 asm ("rorl %%cl,%0" 51 } //box
52 asm ("rorl %%cl,%0"
51 :"=r" (word) 53 :"=r" (word)
52 :"0" (word),"c" (i)); 54 :"0" (word),"c" (i));
53 return word; 55 return word;
54} 56}
55 57
56/******************************************************************************/ 58/******************************************************************************/