From 5ae267a8a26cea6e30d774c1aa36d1ab408be062 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Thu, 6 Nov 2014 03:02:25 +0000
Subject: [PATCH] EdDSA bugfixes

---
 core/java/src/net/i2p/crypto/eddsa/Utils.java                   | 2 +-
 .../net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/src/net/i2p/crypto/eddsa/Utils.java b/core/java/src/net/i2p/crypto/eddsa/Utils.java
index 0b471550c..92cafaf23 100644
--- a/core/java/src/net/i2p/crypto/eddsa/Utils.java
+++ b/core/java/src/net/i2p/crypto/eddsa/Utils.java
@@ -31,7 +31,7 @@ public class Utils {
         for (int i = 0; i < 32; i++) {
             result |= b[i] ^ c[i];
         }
-        return ~equal(result, 0) & 0x01;
+        return equal(result, 0);
     }
 
     /**
diff --git a/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java b/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java
index bfa6fef64..dc527e369 100644
--- a/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java
+++ b/core/java/src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java
@@ -26,7 +26,7 @@ public class Ed25519FieldElement extends FieldElement {
 
     public boolean isNonZero() {
         byte[] s = toByteArray();
-        return Utils.equal(s, ZERO) == 1;
+        return Utils.equal(s, ZERO) == 0;
     }
 
     /**