From f3b6ee30f4995d74f1008ffbe10e1b59caaffcaa Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 21 Jan 2015 19:18:47 +0000 Subject: Move more comments that confuse indent Conflicts: crypto/dsa/dsa.h demos/engines/ibmca/hw_ibmca.c ssl/ssl_locl.h Reviewed-by: Tim Hudson --- crypto/bn/bn_lib.c | 13 +++++++------ crypto/bn/rsaz_exp.c | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'crypto/bn') diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c index 7a8f8c1450..c711b2d6ce 100644 --- a/crypto/bn/bn_lib.c +++ b/crypto/bn/bn_lib.c @@ -350,6 +350,11 @@ static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words) a0=B[0]; a1=B[1]; a2=B[2]; a3=B[3]; A[0]=a0; A[1]=a1; A[2]=a2; A[3]=a3; } + /* + * workaround for ultrix cc: without 'case 0', the optimizer does + * the switch table by doing a=top&3; a--; goto jump_table[a]; + * which fails for top== 0 + */ switch (b->top&3) { case 3: A[2]=B[2]; @@ -357,11 +362,6 @@ static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words) case 1: A[0]=B[0]; case 0: ; - /* - * workaround for ultrix cc: without 'case 0', the optimizer does - * the switch table by doing a=top&3; a--; goto jump_table[a]; - * which fails for top== 0 - */ } } @@ -508,12 +508,13 @@ BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b) a0=B[0]; a1=B[1]; a2=B[2]; a3=B[3]; A[0]=a0; A[1]=a1; A[2]=a2; A[3]=a3; } + /* ultrix cc workaround, see comments in bn_expand_internal */ switch (b->top&3) { case 3: A[2]=B[2]; case 2: A[1]=B[1]; case 1: A[0]=B[0]; - case 0: ; /* ultrix cc workaround, see comments in bn_expand_internal */ + case 0: ; } #else memcpy(a->d,b->d,sizeof(b->d[0])*b->top); diff --git a/crypto/bn/rsaz_exp.c b/crypto/bn/rsaz_exp.c index 54f5760120..6a1ffe2d4f 100644 --- a/crypto/bn/rsaz_exp.c +++ b/crypto/bn/rsaz_exp.c @@ -60,7 +60,8 @@ void rsaz_1024_red2norm_avx2(void *norm,const void *red); # define ALIGN64 # pragma align 64(one,two80) #else -# define ALIGN64 /* not fatal, might hurt performance a little */ +/* not fatal, might hurt performance a little */ +# define ALIGN64 #endif ALIGN64 static const BN_ULONG one[40] = { -- cgit v1.2.3