wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug with s2n et al macros

Browse source 
The parameters should have parens around them when used.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2016-07-07 15:51:17 +01:00
parent c76a4aead2
commit d4450e4bb9
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ssl/ssl_locl.h
View file

@ -141,18 +141,18 @@
} \ } \
} }
# define n2s(c,s) ((s=(((unsigned int)(c[0]))<< 8)| \ # define n2s(c,s) ((s=(((unsigned int)((c)[0]))<< 8)| \
(((unsigned int)(c[1])) )),c+=2) (((unsigned int)((c)[1])) )),(c)+=2)
# define s2n(s,c) ((c[0]=(unsigned char)(((s)>> 8)&0xff), \ # define s2n(s,c) (((c)[0]=(unsigned char)(((s)>> 8)&0xff), \
c[1]=(unsigned char)(((s) )&0xff)),c+=2) (c)[1]=(unsigned char)(((s) )&0xff)),(c)+=2)
# define n2l3(c,l) ((l =(((unsigned long)(c[0]))<<16)| \ # define n2l3(c,l) ((l =(((unsigned long)((c)[0]))<<16)| \
(((unsigned long)(c[1]))<< 8)| \ (((unsigned long)((c)[1]))<< 8)| \
(((unsigned long)(c[2])) )),c+=3) (((unsigned long)((c)[2])) )),(c)+=3)
# define l2n3(l,c) ((c[0]=(unsigned char)(((l)>>16)&0xff), \ # define l2n3(l,c) (((c)[0]=(unsigned char)(((l)>>16)&0xff), \
c[1]=(unsigned char)(((l)>> 8)&0xff), \ (c)[1]=(unsigned char)(((l)>> 8)&0xff), \
c[2]=(unsigned char)(((l) )&0xff)),c+=3) (c)[2]=(unsigned char)(((l) )&0xff)),(c)+=3)
#define DTLS_VERSION_GT(v1, v2) ((v1) < (v2)) #define DTLS_VERSION_GT(v1, v2) ((v1) < (v2))
#define DTLS_VERSION_GE(v1, v2) ((v1) <= (v2)) #define DTLS_VERSION_GE(v1, v2) ((v1) <= (v2))