From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 19 Sep 2019 20:01:22 +0000 (+0000)
Subject: Fix bizarre `if (!consttime_memeq(X, Y, N)!=0)' idioms.
X-Git-Tag: v0.4.5~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=30ba82a584441fc730ad733081805d15fd07bd09;p=secnet.git

Fix bizarre `if (!consttime_memeq(X, Y, N)!=0)' idioms.

Clang thinks the `!' is in the wrong place.  I think the `!=0' isn't
doing any work, so I've deleted it.

This stems from 5ad34db2ccbb "memcmp: Introduce and use
consttime_memeq",

  -    if (memcmp(m->nR,st->remoteN,NONCELEN)!=0) {
  +    if (!consttime_memeq(m->nR,st->remoteN,NONCELEN)!=0) {

at which time the !=0 was already redundant and became more confusing.

Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/site.c b/site.c
index c702c78..4ec56df 100644
--- a/site.c
+++ b/site.c
@@ -767,7 +767,7 @@ static bool_t check_msg(struct site *st, uint32_t type, struct msg *m,
 	return False;
     }
     if (type==LABEL_MSG2) return True;
-    if (!consttime_memeq(m->nR,st->remoteN,NONCELEN)!=0) {
+    if (!consttime_memeq(m->nR,st->remoteN,NONCELEN)) {
 	*error="wrong remotely-generated nonce";
 	return False;
     }
diff --git a/transform-cbcmac.c b/transform-cbcmac.c
index 5e59e21..ad9e901 100644
--- a/transform-cbcmac.c
+++ b/transform-cbcmac.c
@@ -231,7 +231,7 @@ static transform_apply_return transform_reverse(void *sst,
 	serpentbe_encrypt(&ti->mackey,macplain,macacc);
     }
     serpentbe_encrypt(&ti->mackey,macacc,macacc);
-    if (!consttime_memeq(macexpected,macacc,16)!=0) {
+    if (!consttime_memeq(macexpected,macacc,16)) {
 	*errmsg="invalid MAC";
 	return transform_apply_err;
     }